Update remote branch

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')],
  ],
  }
 }

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();

modules/.submodules.json

@@ -70,7 +70,8 @@
  ],
  "fpdModule": [
  "enrichmentFpdModule",
- "validationFpdModule"
+ "validationFpdModule",
+ "topicsFpdModule"
  ]
  },
  "libraries": {

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,
 

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 [];
  }

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);

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) {

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 || {};

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++) {

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;

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

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 {

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);

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;

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

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;

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++) {

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;

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