Various modules: don't import global to get version (#11836)

* Update mabidderBidAdapter.js * Update addefendBidAdapter.js * Update orbidderBidAdapter.js * Update adxcgAnalyticsAdapter.js * Update medianetAnalyticsAdapter.js * Update orbidderBidAdapter.js * Update medianetAnalyticsAdapter.js * Update medianetAnalyticsAdapter.js * Update addefendBidAdapter.js * Update mabidderBidAdapter.js * Update orbidderBidAdapter.js * Update pixfutureBidAdapter.js * Update conversantAnalyticsAdapter.js * Update yuktamediaAnalyticsAdapter.js * Update medianetBidAdapter.js * Update id5AnalyticsAdapter.js * Update tappxBidAdapter.js * Update adlooxRtdProvider.js * Update snigelBidAdapter.js * Update terceptAnalyticsAdapter.js * Update conversantAnalyticsAdapter.js * Update pixfutureBidAdapter.js * Update tappxBidAdapter.js * Update conversantAnalyticsAdapter_spec.js * Update conversantAnalyticsAdapter.js * Update conversantAnalyticsAdapter_spec.js
prebid · Jun 25, 2024 · 980a11e · 980a11e
1 parent d8937d7
commit 980a11e
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 27 deletions.
diff --git a/modules/addefendBidAdapter.js b/modules/addefendBidAdapter.js
@@ -1,5 +1,4 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 
 const BIDDER_CODE = 'addefend';
 
@@ -17,7 +16,7 @@ export const spec = {
  },
  buildRequests: function(validBidRequests, bidderRequest) {
  let bid = {
- v: getGlobal().version,
+ v: 'v' + '$prebid.version$',
  auctionId: false,
  pageId: false,
  gdpr_applies: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? bidderRequest.gdprConsent.gdprApplies : 'true',

diff --git a/modules/adlooxRtdProvider.js b/modules/adlooxRtdProvider.js
@@ -106,7 +106,7 @@ function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
 
  // buildUrl creates PHP style multi-parameters and includes undefined... (╯°□°)╯ ┻━┻
  const url = buildUrl(mergeDeep(parseUrl(`${API_ORIGIN}/q`), { search: {
- 'v': `pbjs-${getGlobal().version}`,
+ 'v': 'pbjs-v' + '$prebid.version$',
  'c': config.params.clientid,
  'p': config.params.platformid,
  't': config.params.tagid,

diff --git a/modules/adxcgAnalyticsAdapter.js b/modules/adxcgAnalyticsAdapter.js
@@ -3,7 +3,6 @@ import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { EVENTS } from '../src/constants.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 
 /**
  * Analytics adapter from adxcg.com
@@ -123,7 +122,7 @@ function send (data) {
  ats: adxcgAnalyticsAdapter.context.auctionTimestamp,
  aav: adxcgAnalyticsVersion,
  iob: intersectionObserverAvailable(window) ? '1' : '0',
- pbv: getGlobal().version,
+ pbv: '$prebid.version$',
  sz: window.screen.width + 'x' + window.screen.height
  }
  });

diff --git a/modules/conversantAnalyticsAdapter.js b/modules/conversantAnalyticsAdapter.js
@@ -1,7 +1,6 @@
 import {ajax} from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import { EVENTS } from '../src/constants.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 import adapterManager from '../src/adapterManager.js';
 import {logInfo, logWarn, logError, logMessage, deepAccess, isInteger} from '../src/utils.js';
 import {getRefererInfo} from '../src/refererDetection.js';
@@ -515,7 +514,7 @@ cnvrHelper.createPayload = function(payloadType, auctionId, timestamp) {
  cnvrSampleRate: initOptions.cnvr_sample_rate,
  auction: {
  auctionId: auctionId,
- preBidVersion: getGlobal().version,
+ preBidVersion: '$prebid.version$',
  sid: initOptions.site_id,
  auctionTimestamp: timestamp
  },

diff --git a/modules/id5AnalyticsAdapter.js b/modules/id5AnalyticsAdapter.js
@@ -4,7 +4,6 @@ import adapterManager from '../src/adapterManager.js';
 import { ajax } from '../src/ajax.js';
 import { logInfo, logError } from '../src/utils.js';
 import * as events from '../src/events.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 
 const {
  AUCTION_END,
@@ -33,7 +32,7 @@ const FLUSH_EVENTS = [
 
 const CONFIG_URL_PREFIX = 'https://api.id5-sync.com/analytics'
 const TZ = new Date().getTimezoneOffset();
-const PBJS_VERSION = getGlobal().version;
+const PBJS_VERSION = 'v' + '$prebid.version$';
 const ID5_REDACTED = '__ID5_REDACTED__';
 const isArray = Array.isArray;
 

diff --git a/modules/mabidderBidAdapter.js b/modules/mabidderBidAdapter.js
@@ -1,6 +1,5 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
-import { getGlobal } from '../src/prebidGlobal.js';
 import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 
 const BIDDER_CODE = 'mabidder';
@@ -39,7 +38,7 @@ export const spec = {
  url: baseUrl,
  method: 'POST',
  data: {
- v: getGlobal().version,
+ v: 'v' + '$prebid.version$',
  bids: bids,
  url: bidderRequest.refererInfo.page || '',
  referer: bidderRequest.refererInfo.ref || '',

diff --git a/modules/medianetAnalyticsAdapter.js b/modules/medianetAnalyticsAdapter.js
@@ -36,8 +36,7 @@ const PRICE_GRANULARITY = {
 };
 
 const MEDIANET_BIDDER_CODE = 'medianet';
-// eslint-disable-next-line no-undef
-const PREBID_VERSION = getGlobal().version;
+const PREBID_VERSION = '$prebid.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';

diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
@@ -186,7 +186,7 @@ function extParams(bidRequest, bidderRequests) {
  const coppaApplies = !!(config.getConfig('coppa'));
  return Object.assign({},
  { customer_id: params.cid },
- { prebid_version: getGlobal().version },
+ { prebid_version: 'v' + '$prebid.version$' },
  { gdpr_applies: gdprApplies },
  (gdprApplies) && { gdpr_consent_string: gdpr.consentString || '' },
  { usp_applies: uspApplies },

diff --git a/modules/orbidderBidAdapter.js b/modules/orbidderBidAdapter.js
@@ -3,7 +3,6 @@ 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';
-import { getGlobal } from '../src/prebidGlobal.js';
 
 /**
  * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
@@ -104,7 +103,7 @@ export const spec = {
  method: 'POST',
  options: { withCredentials: true },
  data: {
- v: getGlobal().version,
+ v: 'v' + '$prebid.version$',
  pageUrl: referer,
  ...bidRequest // get all data provided by bid request
  }

diff --git a/modules/pixfutureBidAdapter.js b/modules/pixfutureBidAdapter.js
@@ -5,7 +5,6 @@ import {config} from '../src/config.js';
 import {find, includes} from '../src/polyfill.js';
 import {deepAccess, isArray, isFn, isNumber, isPlainObject} from '../src/utils.js';
 import {auctionManager} from '../src/auctionManager.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 import {getANKeywordParam} from '../libraries/appnexusUtils/anKeywords.js';
 import {convertCamelToUnderscore} from '../libraries/appnexusUtils/anUtils.js';
 
@@ -126,7 +125,7 @@ export const spec = {
  method: 'POST',
  options: {withCredentials: true},
  data: {
- v: getGlobal().version,
+ v: 'v' + '$prebid.version$',
  pageUrl: referer,
  bidId: bidRequest.bidId,
  // TODO: fix auctionId leak: https://github.com/prebid/Prebid.js/issues/9781

diff --git a/modules/snigelBidAdapter.js b/modules/snigelBidAdapter.js
@@ -3,7 +3,6 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {deepAccess, isArray, isFn, isPlainObject, inIframe, getDNT, generateUUID} from '../src/utils.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 import {getStorageManager} from '../src/storageManager.js';
 
 const BIDDER_CODE = 'snigel';
@@ -46,7 +45,7 @@ export const spec = {
  gdprConsent: gdprApplies === true ? hasFullGdprConsent(deepAccess(bidderRequest, 'gdprConsent')) : false,
  cur: getCurrencies(),
  test: getTestFlag(),
- version: getGlobal().version,
+ version: 'v' + '$prebid.version$',
  gpp: deepAccess(bidderRequest, 'gppConsent.gppString') || deepAccess(bidderRequest, 'ortb2.regs.gpp'),
  gpp_sid:
  deepAccess(bidderRequest, 'gppConsent.applicableSections') || deepAccess(bidderRequest, 'ortb2.regs.gpp_sid'),

diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
@@ -6,7 +6,6 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { parseDomain } from '../src/refererDetection.js';
-import { getGlobal } from '../src/prebidGlobal.js';
 
 /**
  * @typedef {import('../src/adapters/bidderFactory.js').BidRequest} BidRequest
@@ -494,7 +493,7 @@ function buildOneRequest(validBidRequests, bidderRequest) {
  payload.regs = regs;
  // < Payload
 
- let pbjsv = (getGlobal().version !== null) ? encodeURIComponent(getGlobal().version) : -1;
+ let pbjsv = 'v' + '$prebid.version$';
 
  return {
  method: 'POST',

diff --git a/modules/terceptAnalyticsAdapter.js b/modules/terceptAnalyticsAdapter.js
@@ -3,7 +3,6 @@ import { ajax } from '../src/ajax.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { EVENTS } from '../src/constants.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
@@ -124,7 +123,7 @@ function send(data, status) {
  search: {
  auctionTimestamp: auctionTimestamp,
  terceptAnalyticsVersion: terceptAnalyticsVersion,
- prebidVersion: getGlobal().version
+ prebidVersion: 'v' + '$prebid.version$'
  }
  });
 

diff --git a/modules/yuktamediaAnalyticsAdapter.js b/modules/yuktamediaAnalyticsAdapter.js
@@ -6,7 +6,6 @@ import { EVENTS, STATUS } from '../src/constants.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {includes as strIncludes} from '../src/polyfill.js';
-import {getGlobal} from '../src/prebidGlobal.js';
 import {MODULE_TYPE_ANALYTICS} from '../src/activities/modules.js';
 
 const MODULE_CODE = 'yuktamedia';
@@ -37,7 +36,7 @@ const _pageInfo = {
  referer: referer,
  refererDomain: parseUrl(referer).host,
  yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
- prebidVersion: getGlobal().version
+ prebidVersion: 'v' + 'prebid.version$'
 };
 
 function getParameterByName(param) {

diff --git a/test/spec/modules/conversantAnalyticsAdapter_spec.js b/test/spec/modules/conversantAnalyticsAdapter_spec.js
@@ -14,7 +14,7 @@ describe('Conversant analytics adapter tests', function() {
  let clock; // clock stub from sinon to mock our cache cleanup interval
  let logInfoStub;
 
- const PREBID_VERSION = '1.2';
+ const PREBID_VERSION = '$prebid.version$';
  const SITE_ID = 108060;
 
  let requests;