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

9.0 upstream #11735

Merged
merged 45 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
00ffb82
ampliffyBidAdapter.js: remove linter exceptions (#11666)
patmmccann Jun 3, 2024
dbf9817
GPID is set first from GPID, then from pbadslot as a fallback. (#11542)
MartinGumGum Jun 3, 2024
566988f
chore: pass through paapi imp extension [PB-2799] (#11639)
ccorbo Jun 3, 2024
eb1a360
ViouslyBidAdapter.js: replace find (#11667)
patmmccann Jun 3, 2024
2752e0a
New PAAPI module: topLevelPaapi (#11379)
dgirardi Jun 4, 2024
61a6ce4
e-Volution Bid Adapter : update bid request validation and added vide…
e-volution-tech Jun 4, 2024
3e2df8d
Opsco Bid Adapter : update process for retrieving placementId from bi…
ops-co Jun 4, 2024
62b1bea
StroeerCore Bid Adapter: remove 'ssl' flag from the request payload (…
philipwatson Jun 4, 2024
d6e9ca0
AdMatic Bid Adapter: add monetixads alias (#11679)
fatihkaya84 Jun 4, 2024
5653058
Various places: jsdoc fixes (#11672)
patmmccann Jun 4, 2024
1258c53
Smarthub replace placement (#11629)
SmartHubSolutions Jun 4, 2024
cf370ca
Merge branch 'master' into 9.0
dgirardi Jun 4, 2024
3c4cf92
Marsmedia: remove analytics adapter (#11686)
vladi-mmg Jun 4, 2024
402b524
Vis X Bid Adapter : retrieve and send seller defined audiences (#11638)
Goncakkd Jun 4, 2024
6478666
33Across User ID Module : support for the recently introduced "multip…
carlosfelix Jun 4, 2024
82ce88e
Default to fetch keepalive (#11682)
mkomorski Jun 4, 2024
16263f3
Dailymotion Bid Adapter: add support for user syncs & new fields (#11…
kvnsw Jun 4, 2024
5b7df85
ZetaGlobalSsp Analytics Adapter : provide device object (#11607)
asurovenko-zeta Jun 4, 2024
7dec6e8
JW Player RTD Adapter: 9.0 migration (#11692)
karimMourra Jun 4, 2024
caa9979
9.0: Update gumgumBidAdapter.js (#11693)
patmmccann Jun 4, 2024
47e6561
Core Utils: fix jsdoc warnings (#11694)
patmmccann Jun 4, 2024
0396968
Prebid 9: rename fledge to paapi (#11695)
dgirardi Jun 4, 2024
6b8f611
9.0: remove rsa validate
patmmccann Jun 4, 2024
205e173
9.0: Update package.json (#11697)
patmmccann Jun 4, 2024
11377dd
Criteo Bid Adapter: Update bidder DNS (#11700)
leonardlabat Jun 5, 2024
e802e21
datablocksBidAdapter.js: fix syncs issue (#11684)
patmmccann Jun 5, 2024
13b87fa
ColossusSSP Bid Adapter : replace gpid for pbadslot (#11701)
bhasker-ddh Jun 5, 2024
105c662
Bidmatic Bid Adapter: Initial Release (#11690)
GeneGenie Jun 5, 2024
9959427
Update sovrnBidAdapter.js: support plcmt (#11704)
patmmccann Jun 5, 2024
50023d0
9.0: Update quantcastBidAdapter.js for plcmt (#11707)
patmmccann Jun 5, 2024
b932759
9.0: Update acuityadsBidAdapter.js to add plcmt (#11710)
patmmccann Jun 5, 2024
fd8f2e1
33Across ID System: Fix merge conflicts between master & 9.0 (#11715)
carlosfelix Jun 5, 2024
cb91a7c
Support for cids (#11713)
MartinGumGum Jun 5, 2024
d462b17
Revert "9.0: Update gumgumBidAdapter.js (#11693)" (#11717)
patmmccann Jun 5, 2024
f4c0b7b
Add plmct (#11706)
Rothalack Jun 5, 2024
ee32810
9.0: 10452 enforce, need plcmt to get placement (#11718)
patmmccann Jun 6, 2024
451135f
Merge branch 'master' into 9.0
dgirardi Jun 6, 2024
e6868ca
ORTB2: don't rely on context to infer video.placement (#11719)
patmmccann Jun 6, 2024
0e1189f
Update prebidServerBidAdapter_spec.js
patmmccann Jun 6, 2024
c655d68
Update viantOrtbBidAdapter_spec.js
patmmccann Jun 6, 2024
462ee4f
remove adbookpsp
ChrisHuie Jun 6, 2024
aabca94
IX Bid Adapter: Remove Roundel Alias (#11732)
lksharma Jun 7, 2024
40252c5
Update package-lock.json
patmmccann Jun 7, 2024
369493f
Update package-lock.json
patmmccann Jun 7, 2024
a26373e
Merge branch '6305-browserslist-caniuselite' into 9.0-upstream
patmmccann Jun 7, 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
1 change: 0 additions & 1 deletion allowedModules.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

module.exports = {
'modules': [
'criteo-direct-rsa-validate',
'crypto-js',
'live-connect' // Maintained by LiveIntent : https://github.com/liveintent-berlin/live-connect/
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!--
FLEDGE (Protected Audience API) configuration with GPT and FLEDGE-supporting adapter
gulp serve --modules=fledgeForGpt,openxBidAdapter
gulp serve --modules=paapiForGpt,openxBidAdapter
-->
<script async src="../../build/dev/prebid.js"></script>
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!--
FLEDGE (Protected Audience API) configuration with GPT and Prebid-Server
gulp serve --modules=fledgeForGpt,prebidServerBidAdapter
gulp serve --modules=paapiForGpt,prebidServerBidAdapter
-->
<script async src="../../build/dev/prebid.js"></script>
<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
Expand Down Expand Up @@ -44,8 +44,8 @@

pbjs.que.push(function() {
pbjs.setConfig({
fledgeForGpt: {
enabled: true
paapi: {
enabled: true,
},
s2sConfig: [{
accountId : '1',
Expand All @@ -57,13 +57,6 @@
}]
});

pbjs.setBidderConfig({
bidders: ['openx'],
config: {
fledgeEnabled: true
}
});

pbjs.addAdUnits(adUnits);

pbjs.requestBids({
Expand Down
188 changes: 0 additions & 188 deletions integrationExamples/gpt/top-level-paapi/tl_paapi_example.html

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@
waitForIt: true,
params: {
// Note: the following media Ids are placeholders and should be replaced with your Ids.
mediaIDs: ['abc', 'def', 'ghi', 'jkl']
mediaIDs: ['abc', 'def', 'ghi', 'jkl'],
overrideContentId: 'always',
overrideContentUrl: 'always',
overrideContentTitle: 'always',
overrideContentDescription: 'always'
}
}]
}
Expand Down
134 changes: 134 additions & 0 deletions integrationExamples/top-level-paapi/gam-contextual.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<html xmlns="http://www.w3.org/1999/html">
<head>
<script src="shared/example-setup.js"></script>
<script src="../../build/dev/prebid.js"></script>

<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>

<script>
var FAILSAFE_TIMEOUT = 3300;
var PREBID_TIMEOUT = 3000;
var adUnits = [{
code: 'div-1',
mediaTypes: {
banner: {
sizes: [[300, 250]],
}
},
ortb2Imp: {
ext: {
ae: 1
}
},
bids: [
{
bidder: 'optable',
params: {
site: 'daa30ba1-5613-4a2c-b7f0-34e2c033202a'
},
},
{
bidder: 'contextual',
params: {
site: 'daa30ba1-5613-4a2c-b7f0-34e2c033202a'
}
}
],
}
]
;

var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];

var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function () {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function () {
pbjs.setConfig({
debug: true,
paapi: {
enabled: true,
gpt: {
autoconfig: false
},
topLevelSeller: {
auctionConfig: {
seller: window.location.origin,
decisionLogicURL: new URL('shared/decisionLogic.js', window.location).toString(),
},
overrideWinner: true
}
},
});

pbjs.addAdUnits(adUnits);
requestBids();
});

function requestBids() {
pbjs.adserverRequestSent = false;
pbjs.requestBids({
bidsBackHandler: sendAdserverRequest,
timeout: PREBID_TIMEOUT
});
}

function sendAdserverRequest() {
if (pbjs.adserverRequestSent) return;
pbjs.adserverRequestSent = true;
googletag.cmd.push(function () {
pbjs.que.push(function () {
pbjs.setTargetingForGPTAsync();
googletag.pubads().refresh();
});
});
}

setTimeout(function () {
sendAdserverRequest();
}, FAILSAFE_TIMEOUT);

googletag.cmd.push(function () {
googletag.defineSlot('/41758329/integ-test', [[300, 250], [300, 600]], 'div-1').setTargeting('creative', 'banner-safeframe').addService(googletag.pubads());

googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
</head>

<body>
<h2>GAM contextual + Publisher as top level PAAPI seller example</h2>

<p>
This example starts PAAPI auctions at the same time as GAM targeting. The flow is
similar to a typical GAM auction, but if Prebid wins, and got a
PAAPI bid, it is rendered instead of the contextual bid.
</p>
<div id="controls">
<script>addExampleControls(requestBids)</script>
</div>
<h5>Div-1</h5>
<div id="div-1" style='min-width: 300px; min-height: 250px;'>
<script type='text/javascript'>
googletag.cmd.push(function () {
googletag.display('div-1');
});
</script>
</div>
<div style="margin-top: 20px">
<h2>Instructions</h2>
<p>Start local server with:</p>
<code>gulp serve-fast --https</code>
<p>Chrome flags:</p>
<code>--enable-features=CookieDeprecationFacilitatedTesting:label/treatment_1.2/force_eligible/true
--privacy-sandbox-enrollment-overrides=https://localhost:9999</code>
<p>Join interest group at <a href="https://www.optable.co/">https://www.optable.co/</a>
</p>
</div>
</body>
</html>
Loading