Blue Billywig - sync with master, resolve merge conflict

.circleci/config.yml

@@ -92,3 +92,6 @@ workflows:
                 - master
     jobs:
       - e2etest
+
+experimental:
+  pipelines: true

PR_REVIEW.md

@@ -46,11 +46,16 @@ For modules and core platform updates, the initial reviewer should request an ad
 
 ## Ticket Coordinator
 
-Each week, Prebid Org assigns one person to keep an eye on incoming issues and PRs. That person should:
+Each week, Prebid Org assigns one person to keep an eye on incoming issues and PRs. Every Monday morning a reminder is
+sent to the prebid-js slack channel with a link to the spreadsheet. If you're on rotation, please check that list each
+Monday to see if you're on-duty.
+
+When on-duty:
 - Review issues and PRs at least once per weekday for new items. Encourage a 48 "SLA" on PRs/issues assigned. Aim for touchpoint once every 48/hours. 
-- For PRs: assign PRs to individuals on the PR review list. Try to be equitable -- not all PRs are created equally. Use the "Assigned" field and add the "Needs Review" label.
+- For PRs: assign PRs to individuals on the **PR review list**. Try to be equitable -- not all PRs are created equally. Use the "Assigned" field and add the "Needs Review" label.
 - For Issues: try to address questions and troubleshooting requests on your own, assigning them to others as needed. Please add labels as appropriate (I.E. bug, question, backlog etc).
 - Issues that are questions or troubleshooting requests may be closed if the originator doesn't respond within a week to requests for confirmation or details.
 - Issues that are bug reports should be left open and assigned to someone in PR rotation to confirm or deny the bug status.
-- It's polite to check with others before assigning them large tasks.
-- If possible, check in on older items and see if they can be unstuck.
+- It's polite to check with others before assigning them extra-large tasks.
+- If possible, check in on older PRs and Issues and see if they can be unstuck.
+- Perform the weekly Prebid.js release per instructions at https://github.com/prebid/Prebid.js/blob/master/RELEASE_SCHEDULE.md . This generally takes place on Tues or Weds.

allowedModules.js

@@ -1,11 +1,11 @@
 
 const sharedWhiteList = [
-  'core-js/library/fn/array/find', // no ie11
-  'core-js/library/fn/array/includes', // no ie11
-  'core-js/library/fn/set', // ie11 supports Set but not Set#values
-  'core-js/library/fn/string/includes', // no ie11
-  'core-js/library/fn/number/is-integer', // no ie11,
-  'core-js/library/fn/array/from' // no ie11
+  'core-js-pure/features/array/find', // no ie11
+  'core-js-pure/features/array/includes', // no ie11
+  'core-js-pure/features/set', // ie11 supports Set but not Set#values
+  'core-js-pure/features/string/includes', // no ie11
+  'core-js-pure/features/number/is-integer', // no ie11,
+  'core-js-pure/features/array/from' // no ie11
 ];
 
 module.exports = {

gulpHelpers.js

@@ -84,7 +84,9 @@ module.exports = {
           if (fs.lstatSync(modulePath).isDirectory()) {
             modulePath = path.join(modulePath, 'index.js')
           }
-          memo[modulePath] = moduleName;
+          if (fs.existsSync(modulePath)) {
+            memo[modulePath] = moduleName;
+          }
           return memo;
         }, {});
     } catch (err) {

integrationExamples/gpt/digitrust_Simple.html

@@ -148,6 +148,9 @@
                                 }
                                 else {
                                     console.error('Digitrust init failed');
+                                    if(digiTrustResult.err){
+                                        console.error(digiTrustResult.err);
+                                    }
                                 }
                             }
                         },
@@ -157,6 +160,12 @@
                             expires: 60
                         }
                     }]
+                },
+                userIdTargeting: {
+                    "GAM": true,
+                    "GAM_KEYS": {
+                        "tdid": "TTD_ID" // send tdid as TTD_ID
+                    }
                 }
             });
             pbjs.addAdUnits(adUnits);

modules/1ad4goodBidAdapter.js

@@ -1,8 +1,8 @@
 import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import find from 'core-js/library/fn/array/find.js';
-import includes from 'core-js/library/fn/array/includes.js';
+import find from 'core-js-pure/features/array/find.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const BIDDER_CODE = '1ad4good';
 const URL = 'https://hb.1ad4good.org/prebid';

modules/adagioBidAdapter.js

@@ -1,4 +1,4 @@
-import find from 'core-js/library/fn/array/find.js';
+import find from 'core-js-pure/features/array/find.js';
 import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { loadExternalScript } from '../src/adloader.js'
@@ -7,14 +7,14 @@ import sha256 from 'crypto-js/sha256.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'adagio';
-const VERSION = '2.2.0';
+const VERSION = '2.2.1';
 const FEATURES_VERSION = '1';
 const ENDPOINT = 'https://mp.4dex.io/prebid';
 const SUPPORTED_MEDIA_TYPES = ['banner'];
 const ADAGIO_TAG_URL = 'https://script.4dex.io/localstore.js';
 const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
 const GVLID = 617;
-const storage = getStorageManager(GVLID);
+const storage = getStorageManager(GVLID, 'adagio');
 
 export const ADAGIO_PUBKEY = `-----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9el0+OEn6fvEh1RdVHQu4cnT0
@@ -23,10 +23,8 @@ t0b0lsHN+W4n9kitS/DZ/xnxWK/9vxhv0ZtL1LL/rwR5Mup7rmJbNtDoNBw4TIGj
 pV6EP3MTLosuUEpLaQIDAQAB
 -----END PUBLIC KEY-----`;
 
-export function getAdagioScript() {
+export function adagioScriptFromLocalStorageCb(ls) {
   try {
-    const ls = storage.getDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY);
-
     if (!ls) {
       utils.logWarn('Adagio Script not found');
       return;
@@ -58,6 +56,12 @@ export function getAdagioScript() {
   }
 }
 
+export function getAdagioScript() {
+  storage.getDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY, (ls) => {
+    adagioScriptFromLocalStorageCb(ls)
+  });
+}
+
 function canAccessTopWindow() {
   try {
     if (utils.getWindowTop().location.href) {

modules/adheseBidAdapter.js

@@ -170,11 +170,15 @@ function getAdDetails(ad) {
   if (isAdheseAd(ad)) {
     creativeId = ad.id;
     dealId = ad.orderId;
-    originData = { priority: ad.priority, orderProperty: ad.orderProperty, adFormat: ad.adFormat, adType: ad.adType, libId: ad.libId, adspaceId: ad.adspaceId, viewableImpressionCounter: ad.viewableImpressionCounter };
+    originData = { priority: ad.priority, orderProperty: ad.orderProperty, adFormat: ad.adFormat, adType: ad.adType, libId: ad.libId, adspaceId: ad.adspaceId, viewableImpressionCounter: ad.viewableImpressionCounter, slotId: ad.slotID, slotName: ad.slotName, advertiserId: ad.advertiserId, adId: ad.id };
   } else {
     creativeId = ad.origin + (ad.originInstance ? '-' + ad.originInstance : '');
     if (ad.originData) {
       originData = ad.originData;
+      originData.slotId = ad.slotID;
+      originData.slotName = ad.slotName;
+      originData.adType = ad.adType;
+      if (ad.adFormat) originData.adFormat = ad.adFormat;
       if (ad.originData.seatbid && ad.originData.seatbid.length) {
         const seatbid = ad.originData.seatbid[0];
         if (seatbid.bid && seatbid.bid.length) {

modules/adkernelBidAdapter.js

@@ -1,8 +1,8 @@
 import * as utils from '../src/utils.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import find from 'core-js/library/fn/array/find.js';
-import includes from 'core-js/library/fn/array/includes.js';
+import find from 'core-js-pure/features/array/find.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 /*
  * In case you're AdKernel whitelable platform's client who needs branded adapter to

modules/admixerBidAdapter.js

@@ -20,8 +20,22 @@ export const spec = {
   buildRequests: function (validRequest, bidderRequest) {
     const payload = {
       imps: [],
-      referrer: encodeURIComponent(bidderRequest.refererInfo.referer),
     };
+    if (bidderRequest) {
+      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
+        payload.referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
+      }
+      if (bidderRequest.gdprConsent) {
+        payload.gdprConsent = {
+          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;
+      }
+    }
     validRequest.forEach((bid) => {
       payload.imps.push(bid);
     });

modules/adomikAnalyticsAdapter.js

@@ -2,8 +2,8 @@ import adapter from '../src/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { logInfo } from '../src/utils.js';
-import find from 'core-js/library/fn/array/find.js';
-import findIndex from 'core-js/library/fn/array/find-index.js';
+import find from 'core-js-pure/features/array/find.js';
+import findIndex from 'core-js-pure/features/array/find-index.js';
 
 // Events used in adomik analytics adapter
 const auctionInit = CONSTANTS.EVENTS.AUCTION_INIT;

modules/adotBidAdapter.js

@@ -2,7 +2,7 @@ import {Renderer} from '../src/Renderer.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {isStr, isArray, isNumber, isPlainObject, isBoolean, logError} from '../src/utils.js';
-import find from 'core-js/library/fn/array/find.js';
+import find from 'core-js-pure/features/array/find.js';
 
 const ADAPTER_VERSION = 'v1.0.0';
 const BID_METHOD = 'POST';

modules/adpod.js

@@ -20,12 +20,12 @@ import { setupBeforeHookFnOnce, module } from '../src/hook.js';
 import { store } from '../src/videoCache.js';
 import { config } from '../src/config.js';
 import { ADPOD } from '../src/mediaTypes.js';
-import Set from 'core-js/library/fn/set.js';
-import find from 'core-js/library/fn/array/find.js';
+import Set from 'core-js-pure/features/set';
+import find from 'core-js-pure/features/array/find.js';
 import { auctionManager } from '../src/auctionManager.js';
 import CONSTANTS from '../src/constants.json';
 
-const from = require('core-js/library/fn/array/from.js');
+const from = require('core-js-pure/features/array/from.js');
 
 const TARGETING_KEY_PB_CAT_DUR = 'hb_pb_cat_dur';
 const TARGETING_KEY_CACHE_ID = 'hb_cache_id';