Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 26 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1b5def5
Update mabidderBidAdapter.js
patmmccann Jun 20, 2024
c4a986b
Update addefendBidAdapter.js
patmmccann Jun 20, 2024
565cfc4
Update orbidderBidAdapter.js
patmmccann Jun 20, 2024
ad53015
Update adxcgAnalyticsAdapter.js
patmmccann Jun 20, 2024
a9da465
Update medianetAnalyticsAdapter.js
patmmccann Jun 20, 2024
802278e
Update orbidderBidAdapter.js
patmmccann Jun 20, 2024
2d66a8a
Update medianetAnalyticsAdapter.js
patmmccann Jun 20, 2024
b220072
Update medianetAnalyticsAdapter.js
patmmccann Jun 20, 2024
3f67d6d
Update addefendBidAdapter.js
patmmccann Jun 20, 2024
39eb44f
Update mabidderBidAdapter.js
patmmccann Jun 20, 2024
0350a99
Update orbidderBidAdapter.js
patmmccann Jun 20, 2024
ae5ff8b
Update pixfutureBidAdapter.js
patmmccann Jun 20, 2024
f36aecc
Update conversantAnalyticsAdapter.js
patmmccann Jun 20, 2024
5b3153a
Update yuktamediaAnalyticsAdapter.js
patmmccann Jun 20, 2024
7112405
Update medianetBidAdapter.js
patmmccann Jun 20, 2024
4cefcbd
Update id5AnalyticsAdapter.js
patmmccann Jun 20, 2024
7c18403
Update tappxBidAdapter.js
patmmccann Jun 20, 2024
be89304
Update adlooxRtdProvider.js
patmmccann Jun 20, 2024
88cb0ca
Update snigelBidAdapter.js
patmmccann Jun 20, 2024
81a5c8a
Update terceptAnalyticsAdapter.js
patmmccann Jun 20, 2024
3474330
Update conversantAnalyticsAdapter.js
patmmccann Jun 20, 2024
c91d01e
Update pixfutureBidAdapter.js
patmmccann Jun 20, 2024
57741c5
Update tappxBidAdapter.js
patmmccann Jun 20, 2024
9f404c6
Update conversantAnalyticsAdapter_spec.js
patmmccann Jun 20, 2024
353e00a
Update conversantAnalyticsAdapter.js
patmmccann Jun 20, 2024
ad0893e
Update conversantAnalyticsAdapter_spec.js
patmmccann Jun 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/addefendBidAdapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {registerBidder} from '../src/adapters/bidderFactory.js';
import {getGlobal} from '../src/prebidGlobal.js';

const BIDDER_CODE = 'addefend';

Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion modules/adlooxRtdProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions modules/adxcgAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
});
Expand Down
3 changes: 1 addition & 2 deletions modules/conversantAnalyticsAdapter.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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
},
Expand Down
3 changes: 1 addition & 2 deletions modules/id5AnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions modules/mabidderBidAdapter.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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 || '',
Expand Down
3 changes: 1 addition & 2 deletions modules/medianetAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion modules/medianetBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
3 changes: 1 addition & 2 deletions modules/orbidderBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -101,7 +100,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
}
Expand Down
3 changes: 1 addition & 2 deletions modules/pixfutureBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions modules/snigelBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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'),
Expand Down
3 changes: 1 addition & 2 deletions modules/tappxBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions modules/terceptAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -124,7 +123,7 @@ function send(data, status) {
search: {
auctionTimestamp: auctionTimestamp,
terceptAnalyticsVersion: terceptAnalyticsVersion,
prebidVersion: getGlobal().version
prebidVersion: 'v' + '$prebid.version$'
}
});

Expand Down
3 changes: 1 addition & 2 deletions modules/yuktamediaAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -37,7 +36,7 @@ const _pageInfo = {
referer: referer,
refererDomain: parseUrl(referer).host,
yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
prebidVersion: getGlobal().version
prebidVersion: 'v' + 'prebid.version$'
};

function getParameterByName(param) {
Expand Down
2 changes: 1 addition & 1 deletion test/spec/modules/conversantAnalyticsAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading