Merge branch 'prebid:master' into master

Author: pm-azhar-mulla

babelConfig.js

@@ -16,7 +16,7 @@ module.exports = function (options = {}) {
         useLocal('@babel/preset-env'),
         {
           'useBuiltIns': 'entry',
-          'corejs': '3.13.0',
+          'corejs': '3.42.0',
           // a lot of tests use sinon.stub & others that stopped working on ES6 modules with webpack 5
           'modules': options.test ? 'commonjs' : 'auto',
         }

gulpHelpers.js

@@ -5,7 +5,7 @@ const argv = require('yargs').argv;
 const MANIFEST = 'package.json';
 const through = require('through2');
 const _ = require('lodash');
-const gutil = require('gulp-util');
+const gutil = require('plugin-error');
 const submodules = require('./modules/.submodules.json').parentModules;
 
 const MODULE_PATH = './modules';

gulpfile.js

@@ -4,7 +4,8 @@
 var _ = require('lodash');
 var argv = require('yargs').argv;
 var gulp = require('gulp');
-var gutil = require('gulp-util');
+var gutil = require('plugin-error');
+var fancyLog = require('fancy-log');
 var connect = require('gulp-connect');
 var webpack = require('webpack');
 var webpackStream = require('webpack-stream');
@@ -17,7 +18,6 @@ var concat = require('gulp-concat');
 var replace = require('gulp-replace');
 var shell = require('gulp-shell');
 var gulpif = require('gulp-if');
-var sourcemaps = require('gulp-sourcemaps');
 var through = require('through2');
 var fs = require('fs');
 var jsEscape = require('gulp-js-escape');
@@ -193,7 +193,7 @@ function buildCreative(mode = 'production') {
     opts.devtool = 'inline-source-map'
   }
   return function() {
-    return gulp.src(['**/*'])
+    return gulp.src(['creative/**/*'])
       .pipe(webpackStream(Object.assign(require('./webpack.creative.js'), opts)))
       .pipe(gulp.dest('build/creative'))
   }
@@ -229,7 +229,8 @@ function getModulesListToAddInBanner(modules) {
 }
 
 function gulpBundle(dev) {
-  return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist')));
+  const sm = dev || argv.sourceMaps;
+  return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist'), {sourcemaps: sm ? '.' : false}));
 }
 
 function nodeBundle(modules, dev = false) {
@@ -318,15 +319,13 @@ function bundle(dev, moduleArr) {
     outputFileName = outputFileName.replace(/\.js$/, `.${argv.tag}.js`);
   }
 
-  gutil.log('Concatenating files:\n', entries);
-  gutil.log('Appending ' + prebid.globalVarName + '.processQueue();');
-  gutil.log('Generating bundle:', outputFileName);
+  fancyLog('Concatenating files:\n', entries);
+  fancyLog('Appending ' + prebid.globalVarName + '.processQueue();');
+  fancyLog('Generating bundle:', outputFileName);
 
   const wrap = wrapWithHeaderAndFooter(dev, modules);
-  return wrap(gulp.src(entries))
-    .pipe(gulpif(sm, sourcemaps.init({ loadMaps: true })))
-    .pipe(concat(outputFileName))
-    .pipe(gulpif(sm, sourcemaps.write('.')));
+  return wrap(gulp.src(entries, {sourcemaps: sm}))
+    .pipe(concat(outputFileName));
 }
 
 function setupDist() {
@@ -408,7 +407,10 @@ function runWebdriver({file}) {
       wdioConf
     ];
   }
-  return execa(wdioCmd, wdioOpts, { stdio: 'inherit' });
+  return execa(wdioCmd, wdioOpts, {
+    stdio: 'inherit',
+    env: Object.assign({}, process.env, {FORCE_COLOR: '1'})
+  });
 }
 
 function runKarma(options, done) {
@@ -440,7 +442,8 @@ function testCoverage(done) {
     watch: false,
     file: argv.file,
     env: {
-      NODE_OPTIONS: '--max-old-space-size=8096'
+      NODE_OPTIONS: '--max-old-space-size=8096',
+      TEST_CHUNKS: '1'
     }
   }, done);
 }

karma.conf.maker.js

@@ -40,7 +40,6 @@ function newPluginsArray(browserstack) {
   var plugins = [
     'karma-chrome-launcher',
     'karma-coverage',
-    'karma-es5-shim',
     'karma-mocha',
     'karma-chai',
     'karma-sinon',
@@ -56,7 +55,6 @@ function newPluginsArray(browserstack) {
   plugins.push('karma-opera-launcher');
   plugins.push('karma-safari-launcher');
   plugins.push('karma-script-launcher');
-  plugins.push('karma-ie-launcher');
   return plugins;
 }
 
@@ -134,7 +132,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     },
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['es5-shim', 'mocha', 'chai', 'sinon', 'webpack'],
+    frameworks: ['mocha', 'chai', 'sinon', 'webpack'],
 
     // test files should not be watched or they'll run twice after an update
     // (they are still, in fact, watched through autoWatch: true)

libraries/advangUtils/index.js

@@ -1,6 +1,5 @@
 import { deepAccess, generateUUID, isFn, parseSizesInput, parseUrl } from '../../src/utils.js';
 import { config } from '../../src/config.js';
-import { find } from '../../src/polyfill.js';
 
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
@@ -77,7 +76,7 @@ export function getOsVersion() {
     { s: 'UNIX', r: /UNIX/ },
     { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
   ];
-  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
+  let cs = clientStrings.find(cs => cs.r.test(navigator.userAgent));
   return cs ? cs.s : 'unknown';
 }
 

libraries/browsiUtils/browsiUtils.js

@@ -1,6 +1,5 @@
 import { isGptPubadsDefined, logError } from '../../src/utils.js';
 import { setKeyValue as setGptKeyValue } from '../../libraries/gptUtils/gptUtils.js';
-import { find } from '../../src/polyfill.js';
 
 /** @type {string} */
 const VIEWABILITY_KEYNAME = 'browsiViewability';
@@ -89,7 +88,7 @@ export function getSlotByCode(code) {
   if (!slots || !slots.length) {
     return null;
   }
-  return find(slots, s => s.getSlotElementId() === code || s.getAdUnitPath() === code) || null;
+  return slots.find(s => s.getSlotElementId() === code || s.getAdUnitPath() === code) || null;
 }
 
 function getLocalStorageData(storage) {

libraries/gptUtils/gptUtils.js

@@ -1,5 +1,4 @@
 import { CLIENT_SECTIONS } from '../../src/fpd/oneClient.js';
-import {find} from '../../src/polyfill.js';
 import {compareCodeAndSlot, deepAccess, isGptPubadsDefined, uniques} from '../../src/utils.js';
 
 /**
@@ -30,7 +29,7 @@ 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));
+    matchingSlot = window.googletag.pubads().getSlots().find(isSlotMatchingAdUnitCode(adUnitCode));
   }
   return matchingSlot;
 }

modules/conversantBidAdapter.js

@@ -1,20 +1,17 @@
 import {
   buildUrl,
   deepAccess,
-  deepSetValue,
   getBidIdParameter,
   isArray,
   isFn,
   isPlainObject,
   isStr,
-  logError,
   logWarn,
   mergeDeep,
   parseUrl,
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {getStorageManager} from '../src/storageManager.js';
 import {ortbConverter} from '../libraries/ortbConverter/converter.js';
 import {ORTB_MTYPES} from '../libraries/ortbConverter/processors/mediaType.js';
 
@@ -30,7 +27,6 @@ import {ORTB_MTYPES} from '../libraries/ortbConverter/processors/mediaType.js';
 const GVLID = 24;
 
 const BIDDER_CODE = 'conversant';
-export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 const URL = 'https://web.hb.ad.cpe.dotomi.com/cvx/client/hb/ortb/25';
 
 function setSiteId(bidRequest, request) {
@@ -44,14 +40,6 @@ function setSiteId(bidRequest, request) {
   }
 }
 
-function setPubcid(bidRequest, request) {
-  // Add common id if available
-  const pubcid = getPubcid(bidRequest);
-  if (pubcid) {
-    deepSetValue(request, 'user.ext.fpc', pubcid);
-  }
-}
-
 const converter = ortbConverter({
   context: {
     netRevenue: true,
@@ -64,7 +52,6 @@ const converter = ortbConverter({
     if (context.bidRequests) {
       const bidRequest = context.bidRequests[0];
       setSiteId(bidRequest, request);
-      setPubcid(bidRequest, request);
     }
 
     return request;
@@ -224,20 +211,6 @@ export const spec = {
   }
 };
 
-function getPubcid(bidRequest) {
-  let pubcid = null;
-  if (bidRequest.userId && bidRequest.userId.pubcid) {
-    pubcid = bidRequest.userId.pubcid;
-  } else if (bidRequest.crumbs && bidRequest.crumbs.pubcid) {
-    pubcid = bidRequest.crumbs.pubcid;
-  }
-  if (!pubcid) {
-    const pubcidName = getBidIdParameter('pubcid_name', bidRequest.params) || '_pubcid';
-    pubcid = readStoredValue(pubcidName);
-  }
-  return pubcid;
-}
-
 /**
  * Check if it's a video bid request
  *
@@ -261,37 +234,6 @@ function copyOptProperty(src, dst, dstName) {
   }
 }
 
-/**
- * Look for a stored value from both cookie and local storage and return the first value found.
- * @param key Key for the search
- * @return {string} Stored value
- */
-function readStoredValue(key) {
-  let storedValue;
-  try {
-    // check cookies first
-    storedValue = storage.getCookie(key);
-
-    if (!storedValue) {
-      // check expiration time before reading local storage
-      const storedValueExp = storage.getDataFromLocalStorage(`${key}_exp`);
-      if (storedValueExp === '' || (storedValueExp && (new Date(storedValueExp)).getTime() - Date.now() > 0)) {
-        storedValue = storage.getDataFromLocalStorage(key);
-        storedValue = storedValue ? decodeURIComponent(storedValue) : storedValue;
-      }
-    }
-
-    // deserialize JSON if needed
-    if (isStr(storedValue) && storedValue.charAt(0) === '{') {
-      storedValue = JSON.parse(storedValue);
-    }
-  } catch (e) {
-    logError(e);
-  }
-
-  return storedValue;
-}
-
 /**
  * Get the floor price from bid.params for backward compatibility.
  * If not found, then check floor module.

modules/czechAdIdSystem.js

@@ -18,11 +18,18 @@ import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: 'czechAdId' })
 
 // Returns the id string from either cookie or localstorage
-const readId = () => { return storage.getCookie('czaid') || storage.getDataFromLocalStorage('czaid') }
+const readId = () => {
+  const id = storage.getCookie('czaid') || storage.getDataFromLocalStorage('czaid')
+  return id && isValidUUID(id) ? id : null
+}
+const isValidUUID = (str) => {
+  const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
+  return uuidRegex.test(str)
+}
 
 /** @type {Submodule} */
 export const czechAdIdSubmodule = {
-  version: '0.1.0',
+  version: '0.1.1',
   /**
    * used to link submodule with config
    * @type {string}
@@ -38,7 +45,10 @@ export const czechAdIdSubmodule = {
    * @function decode
    * @returns {(Object|undefined)}
    */
-  decode () { return { czechAdId: readId() } },
+  decode () {
+    const id = readId()
+    return id ? { czechAdId: readId() } : undefined
+  },
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function

modules/microadBidAdapter.js

@@ -1,5 +1,4 @@
 import { deepAccess, isArray, isEmpty, isStr } from '../src/utils.js';
-import { } from '../src/polyfill.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';