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

Prebid upgarde automate- test pull request created through git api please ignore it #455

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
449 commits
Select commit Hold shift + click to select a range
caf15e6
Merge pull request #322 from PubMatic-OpenWrap/hookissuefix
pm-shashank-jain Mar 18, 2019
441c069
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Mar 28, 2019
042c940
Support for ext object in icon
pm-shashank-jain Mar 28, 2019
b346108
Merge pull request #323 from PubMatic-OpenWrap/hookissuefix
pm-shashank-jain Mar 28, 2019
4fd7ec1
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Mar 28, 2019
de208cd
automate-creation of modules.json file
pm-pramod-pisal Apr 3, 2019
083ade8
Merge branch 'prebid_upgrade_2_8_0_20190403124838' into test_br_b2_20…
pm-shashank-jain Apr 3, 2019
220f7c7
Merge pull request #326 from PubMatic-OpenWrap/test_br_b2_20190403124840
pm-shashank-jain Apr 3, 2019
ee81117
Fixed merge issue and test cases fixes
pm-shashank-jain Apr 3, 2019
99eaf62
Merge pull request #327 from PubMatic-OpenWrap/prebid_upgrade_2_8_0_2…
pm-shashank-jain Apr 10, 2019
f1a87e0
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Apr 15, 2019
6481d52
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Apr 22, 2019
8cc71d1
Check for valid sizes only
pm-shashank-jain May 6, 2019
f3fb7d6
Unit test cases for the change
pm-shashank-jain May 7, 2019
853f49f
Merge pull request #329 from PubMatic-OpenWrap/multisizesingleimpression
pm-shashank-jain May 17, 2019
937fd6c
automate-creation of modules.json file
pm-pramod-pisal May 23, 2019
e890d17
Merge branch 'prebid_upgrade_2_16_20190523095538' into test_br_b2_201…
pm-shashank-jain May 24, 2019
0d3aae8
Merge pull request #330 from PubMatic-OpenWrap/test_br_b2_20190523095539
pm-shashank-jain May 24, 2019
0908c32
Fixed Merge issues
pm-shashank-jain May 28, 2019
9b42097
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain May 29, 2019
15c3381
UOE-4404 if adslot and mediatype both contain sizes
pm-shashank-jain May 29, 2019
5ddb048
Merge pull request #332 from PubMatic-OpenWrap/prebid_upgrade_2_16_20…
pm-shashank-jain Jun 7, 2019
03f668b
Merge pull request #333 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Jun 10, 2019
67a784d
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Jun 12, 2019
ba619b4
automate-creation of modules.json file
pm-pramod-pisal Jun 12, 2019
4220bc1
Merge branch 'prebid_upgrade_2_18_0_20190612125319' into test_br_b2_2…
pm-shashank-jain Jun 12, 2019
14b0fc4
Merge pull request #334 from PubMatic-OpenWrap/test_br_b2_20190612125320
pm-shashank-jain Jun 12, 2019
30502b8
Initial User Id Module
pm-shashank-jain Jun 12, 2019
f2ad33c
Updated modules.json
pm-shashank-jain Jul 2, 2019
531b34a
automate-creation of modules.json file
pm-pramod-pisal Jul 3, 2019
f1ed468
test commit for pull request 50
pm-pramod-pisal Jul 3, 2019
2fa1777
Merge pull request #340 from PubMatic-OpenWrap/prebid_upgrade_2_22_0_…
pm-shashank-jain Jul 11, 2019
976c2e3
Merge pull request #341 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Jul 15, 2019
4d91be1
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Jul 16, 2019
8882739
Server Side throttling based on condition
pm-shashank-jain Jul 16, 2019
ea89aae
Condition for all partners throttled
pm-shashank-jain Jul 16, 2019
1e59dc5
Changed gulp task dependencies
pm-shashank-jain Jul 24, 2019
de4a378
Build Time Optimization
pm-shashank-jain Aug 1, 2019
d3e8a3e
changed unused gulp packages
pm-shashank-jain Aug 7, 2019
e48ff3a
Updated Package.json
pm-shashank-jain Aug 9, 2019
58a13f4
automate-creation of modules.json file
pm-pramod-pisal Aug 26, 2019
11200ac
test commit for pull request 50
pm-pramod-pisal Aug 26, 2019
770a085
Updated to nightly
pm-shashank-jain Aug 30, 2019
422f881
Resolved conflict
pm-shashank-jain Aug 30, 2019
3371c0a
resolved conflixt
pm-shashank-jain Aug 30, 2019
405e50a
automate-creation of modules.json file
pm-pramod-pisal Sep 11, 2019
0d75a63
Merge branch 'prebid_upgrade_2_32_0_20190911104401' into test_br_b2_2…
pm-shashank-jain Sep 11, 2019
f8644c8
Merge pull request #346 from PubMatic-OpenWrap/test_br_b2_20190911104402
pm-shashank-jain Sep 11, 2019
e62fc06
IdentityPartners
pm-shashank-jain Sep 11, 2019
37e6209
Merge branch 'prebid_upgrade_2_32_0_20190911104401' of https://github…
pm-shashank-jain Sep 11, 2019
5b60fd4
Merge pull request #347 from PubMatic-OpenWrap/serverSideThrottle
pm-shashank-jain Sep 12, 2019
3f44e14
Changes for Hashed Key and parseAdSlot logic
pm-shashank-jain Sep 19, 2019
aac7f2a
Custom Data Moduke
pm-shashank-jain Sep 20, 2019
caa8e08
Fix for custom module
pm-shashank-jain Sep 24, 2019
e3e15cd
Merge branch 'optimizednightly' of https://github.com/PubMatic-OpenWr…
pm-shashank-jain Sep 24, 2019
f0ff249
making call secure of ow
pm-shashank-jain Sep 25, 2019
dca8ed4
Removed implicit customId system and added it as a separated submodule
pm-shashank-jain Sep 25, 2019
0ea35f0
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Sep 25, 2019
f9d0e15
Merge branch 'optimizednightly' of https://github.com/PubMatic-OpenWr…
pm-shashank-jain Sep 25, 2019
0b69d1a
Making server side calls secure and flag secure to 1
pm-shashank-jain Sep 26, 2019
f293694
Merge branch 'staged_nightly' of https://github.com/PubMatic-OpenWrap…
pm-shashank-jain Sep 26, 2019
bdd9727
Changed unifiedId from implicit to explicit
pm-shashank-jain Sep 26, 2019
91ca6f1
Merge pull request #349 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Sep 27, 2019
f8fb763
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Sep 27, 2019
c5124b4
Updated The code to fix text cases
pm-shashank-jain Sep 27, 2019
7abd005
Fixed unit test cases
pm-shashank-jain Sep 27, 2019
d6ea80b
Merge branch 'staged_nightly' of https://github.com/PubMatic-OpenWrap…
pm-shashank-jain Sep 27, 2019
fbb88c0
Took latest for all ids
pm-shashank-jain Sep 27, 2019
ee34043
Fixed the linting issue
pm-shashank-jain Sep 30, 2019
67a8e4f
Custom Data support and ParseInt for Id5
pm-shashank-jain Sep 30, 2019
514dbd7
Fixed custom data
pm-shashank-jain Sep 30, 2019
044bc5e
Updated function call
pm-shashank-jain Sep 30, 2019
adfba3f
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 1, 2019
fc05a81
Merge branch 'staged_nightly' of https://github.com/PubMatic-OpenWrap…
pm-shashank-jain Oct 1, 2019
4d1f519
Changed Event from Auction End to Request Bid
pm-shashank-jain Oct 1, 2019
343052a
Merge branch 'staged_nightly' of https://github.com/PubMatic-OpenWrap…
pm-shashank-jain Oct 3, 2019
1b20719
added secure flag
pm-shashank-jain Oct 3, 2019
464ba3b
Merge pull request #352 from PubMatic-OpenWrap/OpenIdentity
pm-shashank-jain Oct 11, 2019
78f22b9
Revert "Open identity"
pm-shashank-jain Oct 11, 2019
fed46df
Merge pull request #354 from PubMatic-OpenWrap/revert-352-OpenIdentity
pm-shashank-jain Oct 11, 2019
c24ccc8
Revert "Revert "Open identity""
pm-shashank-jain Oct 11, 2019
56b0c19
Merge pull request #355 from PubMatic-OpenWrap/revert-354-revert-352-…
pm-shashank-jain Oct 11, 2019
448937d
First Party Id name updated for cookies
pm-shashank-jain Oct 14, 2019
54d4ae8
PubMatic Handle first Party Id
pm-shashank-jain Oct 14, 2019
5a6ce7e
Merge pull request #356 from PubMatic-OpenWrap/OpenIdentity
pm-shashank-jain Oct 14, 2019
99868c7
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 14, 2019
ea20b78
Pubmatic alias
pm-shashank-jain Oct 15, 2019
c7851b4
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 18, 2019
7fa7a4b
Merge pull request #357 from PubMatic-OpenWrap/pubmaticalias
pm-shashank-jain Oct 18, 2019
5734dcb
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 18, 2019
abb2c64
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 24, 2019
1c869fc
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 24, 2019
3147979
Handle regex pattern in logger for Hybrid Implementation
pm-shashank-jain Oct 30, 2019
fc6ee16
Merge pull request #353 from PubMatic-OpenWrap/feature/regex
pm-shashank-jain Nov 11, 2019
63a6de5
Merge pull request #358 from PubMatic-OpenWrap/allsecure
pm-shashank-jain Nov 11, 2019
253a4a9
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Nov 11, 2019
d54c0a6
Increment pre version
Dec 11, 2019
9ba8031
Somo: fix an issue where the requestId was being set to the wrong val…
Dec 17, 2019
f799046
Sovrn ccpa support legacy (#4623)
aprakash-sovrn Dec 17, 2019
094d921
TripleLift: CCPA legacy support (#4641)
davidwoodsandersen Dec 18, 2019
bc1f991
pbsBidAdapter currency fix for legacy branch (#4642)
bretg Dec 18, 2019
105313b
Prebid 2.44.1 Release
jsnellbaker Dec 18, 2019
01be180
Revert "Prebid 2.44.1 Release"
jsnellbaker Dec 18, 2019
c575ae2
fix a bug when the iframe locator is not present on page (#4637)
mkendall07 Dec 18, 2019
4f030d7
Prebid 2.44.1 Release
jsnellbaker Dec 18, 2019
c549b65
increment pre version
jsnellbaker Dec 18, 2019
5ba6ea9
Index Exchange: CCPA support (#4662)
ix-prebid-support Dec 30, 2019
6a57738
support for us privacy (CCPA) (#4665)
nwlosinski Dec 30, 2019
06f0475
Added CCPA support for legacy (#4663)
JonGoSonobi Dec 30, 2019
7e1e337
Update CCPA v3 (#4677)
itaynave Dec 30, 2019
9b39708
automate-creation of modules.json file
pm-pramod-pisal Jan 2, 2020
0b0ff1b
resolved conflicts
pm-shashank-jain Jan 2, 2020
9a13944
Merge pull request #362 from PubMatic-OpenWrap/test_br_b2_20200102122627
pm-shashank-jain Jan 2, 2020
2585d64
Medianet: CCPA support added (#4656)
binoy-chitale Jan 2, 2020
17d6073
Ccpa legacy support for OneVideo (#4648)
DeepthiNeeladri Jan 2, 2020
9774da7
Add us privacy 2.X (#4669)
Jan 2, 2020
5e89b45
cedato adapter gdpr and usp compliance (#4686)
alexkh13 Jan 3, 2020
abfe757
Fidelity Media Bid Adapter 2.44.x legacy. CCPA support. (#4652)
onaydenov Jan 6, 2020
48b41e8
add dh adapter for legacy prebid 2.x (#4670)
montu1996 Jan 6, 2020
bbc81c1
Prebid 2.44.2 Release
jsnellbaker Jan 7, 2020
4d380b9
Merge pull request #364 from PubMatic-OpenWrap/prebid_upgrade_2_44_1_…
pm-shashank-jain Jan 13, 2020
1acfe03
automate-creation of modules.json file
pm-pramod-pisal Jan 15, 2020
5f5b004
Merge branch 'prebid_upgrade_2_44_2_20200115105543' into test_br_b2_2…
pm-shashank-jain Jan 15, 2020
586f16c
Merge pull request #365 from PubMatic-OpenWrap/test_br_b2_20200115105544
pm-shashank-jain Jan 15, 2020
3613f95
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Jan 15, 2020
3d75e1b
Support for CCPA
pm-shashank-jain Jan 15, 2020
a1ed465
Merge pull request #367 from PubMatic-OpenWrap/prebid_upgrade_2_44_2_…
pm-shashank-jain Jan 21, 2020
019d7dd
Adding tracker in vast creative before cache
pm-shashank-jain Jan 24, 2020
385e18e
Merge branch 'prebid_upgrade_2_44_2_20200115105543' of https://github…
pm-shashank-jain Jan 24, 2020
0c3cff2
add adform alias adform2
pm-shashank-jain Jan 30, 2020
bd65e25
Merge pull request #368 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Feb 3, 2020
a37a086
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Feb 3, 2020
33c0e72
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Feb 3, 2020
6b7b3dd
Updated First Party Module
pm-shashank-jain Feb 4, 2020
b6d9625
Updated our adapter to have firstpartyid
pm-shashank-jain Feb 4, 2020
86f27c3
automate-creation of modules.json file
pm-pramod-pisal Feb 5, 2020
679ce85
Update key value pair for video in openwrap
pm-shashank-jain Feb 6, 2020
7cc7e27
Updated to latest
pm-shashank-jain Feb 7, 2020
4bd4982
Merge branch 'test_br_b2_20200205190640' into prebid_upgrade_3_5_0_20…
pm-shashank-jain Feb 7, 2020
3e3e957
Server side syncup in accordance with latest filter settings
pm-shashank-jain Feb 13, 2020
a036bd3
Merge pull request #370 from PubMatic-OpenWrap/adform_alias
pm-shashank-jain Feb 13, 2020
f5b0a02
Merge branch 'feature/video' of https://github.com/PubMatic-OpenWrap/…
pm-shashank-jain Feb 13, 2020
04f2e53
Merge pull request #372 from PubMatic-OpenWrap/OpenIdentity
pm-shashank-jain Feb 14, 2020
1956ed7
Merge pull request #373 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Feb 17, 2020
9ade5da
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Feb 18, 2020
7a29b2f
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Feb 25, 2020
bd16d11
Support for Eids in PubMaticServerBidAdapter
pm-shashank-jain Feb 26, 2020
ed21ec4
Fix for pubCommonId
pm-shashank-jain Feb 27, 2020
0ffb899
Fix for pubmatic server bid adapter
pm-shashank-jain Feb 27, 2020
6f20f52
Merge pull request #374 from PubMatic-OpenWrap/OpenIdentity
pm-shashank-jain Feb 28, 2020
329837d
fix for player size and considering w & h for video
pm-shashank-jain Mar 2, 2020
bf71333
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Mar 12, 2020
145c3d0
Merge branch 'nightly_legacy_2_44' of https://github.com/PubMatic-Ope…
pm-shashank-jain Mar 12, 2020
f394b6e
Pull latet
pm-shashank-jain Mar 12, 2020
529ed7e
Merge branch 'nightly_legacy_2_44' of https://github.com/PubMatic-Ope…
pm-shashank-jain Mar 12, 2020
bde7f7c
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Mar 12, 2020
7f9c0da
Merge pull request #378 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Mar 16, 2020
ebfa40b
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Mar 17, 2020
8da55d4
automate-creation of modules.json file
pm-pramod-pisal Mar 24, 2020
3422230
Merge branch 'prebid_upgrade_3_12_0_20200324124900' into test_br_b2_2…
pm-shashank-jain Mar 24, 2020
fd8626c
Merge pull request #379 from PubMatic-OpenWrap/test_br_b2_20200324124901
pm-shashank-jain Mar 24, 2020
3e2eb02
Fixed test issues
pm-shashank-jain Mar 24, 2020
126ae7d
automate-creation of modules.json file
pm-pramod-pisal Apr 1, 2020
eeae262
Merge branch 'pb3_14' into prebid_upgrade_3_14_0_20200401161832
pm-shashank-jain Apr 1, 2020
399b17c
Merge pull request #383 from PubMatic-OpenWrap/prebid_upgrade_3_14_0_…
pm-shashank-jain Apr 1, 2020
aec4edc
fix test cases
pm-shashank-jain Apr 1, 2020
10ea6b3
Pull changes for dspid and seatid from prebid master
pm-shashank-jain Apr 8, 2020
a784aa1
Merge pull request #386 from PubMatic-OpenWrap/pb3_14
pm-shashank-jain Apr 10, 2020
4ca81ef
Merge pull request #387 from PubMatic-OpenWrap/groupMChanges
pm-shashank-jain Apr 10, 2020
6898268
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Apr 17, 2020
d673dab
Support for buyerId
pm-shashank-jain Apr 23, 2020
6398268
Updated location of buyid
pm-shashank-jain Apr 24, 2020
89cc83f
automate-creation of modules.json file
pm-pramod-pisal May 6, 2020
f01989b
Merge branch 'prebid_upgrade_3_18_0_20200506145339' into test_br_b2_2…
pm-shashank-jain May 6, 2020
9f451f6
Merge pull request #389 from PubMatic-OpenWrap/test_br_b2_20200506145340
pm-shashank-jain May 6, 2020
c05f9ec
Changes for consuming targeting from server side
pm-shashank-jain May 6, 2020
de80a52
Fix test cases
pm-shashank-jain May 6, 2020
3908538
Merge branch 'prebid_upgrade_3_18_0_20200506145339' of https://github…
pm-shashank-jain May 8, 2020
7266b82
Updated rubiconBidAdapter for alias
pm-shashank-jain May 12, 2020
7052b5c
Merge pull request #390 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain May 15, 2020
7532246
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain May 18, 2020
1204f7c
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Jun 3, 2020
fbaee29
Merge pull request #391 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Jun 3, 2020
9df5cc5
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Jun 5, 2020
1c7ac75
adding sspId
pm-shashank-jain Jun 5, 2020
6827c34
UOE-5262 : OpenWrap: Add Secondary Ad Generation Bidder
deepak-sahu-pubmatic Jun 10, 2020
f68c289
Merge pull request #394 from PubMatic-OpenWrap/ssp_id
pm-shashank-jain Jun 12, 2020
ef9c3f1
Merge pull request #393 from PubMatic-OpenWrap/UOE-5262-ADG2
pm-shashank-jain Jun 18, 2020
3f0ed2e
bluebillywig outstream renderer
pm-shashank-jain Jul 6, 2020
49de7c0
Fix an issue with replacing Renderer
pm-shashank-jain Jul 6, 2020
fbd2cec
Replaced Renderee
pm-shashank-jain Jul 6, 2020
c05d7f6
code review comments
pm-shashank-jain Jul 6, 2020
a81e15b
automate-creation of modules.json file
pm-pramod-pisal Jul 15, 2020
79bc5f5
Merge branch 'prebid_upgrade_3_25_0_20200715173712' into test_br_b2_2…
pm-shashank-jain Jul 15, 2020
9a6260d
added missing adatpers
pm-shashank-jain Jul 15, 2020
0928275
updating package.json for prod dependecies
pm-shashank-jain Jul 21, 2020
24b06ff
updated namespace
pm-shashank-jain Jul 21, 2020
856a960
Merge pull request #396 from PubMatic-OpenWrap/outstream_video
pm-shashank-jain Jul 22, 2020
81d53cb
Fix for SSP ID
pm-shashank-jain Jul 22, 2020
3d1a46d
fixed test cases
pm-shashank-jain Jul 22, 2020
77355e8
Merge branch 'prebid_upgrade_3_25_0_20200715173712' into test_br_b2_2…
pm-shashank-jain Jul 24, 2020
d2d15d6
Merge pull request #398 from PubMatic-OpenWrap/test_br_b2_20200715173713
pm-shashank-jain Jul 24, 2020
f03f3f8
took latest
pm-shashank-jain Jul 24, 2020
5549e56
ternay adapters
pm-shashank-jain Jul 24, 2020
625d8b7
Merge pull request #399 from PubMatic-OpenWrap/prebid_upgrade_3_25_0_…
pm-shashank-jain Jul 27, 2020
42ba815
Merge branch 'nightly' into adfor3_rubicon3
pm-shashank-jain Jul 27, 2020
58f610b
Merge pull request #400 from PubMatic-OpenWrap/adfor3_rubicon3
pm-shashank-jain Jul 27, 2020
e0e3635
Update adformBidAdapter.js
PubMatic-OpenWrap Jul 27, 2020
3dcdcca
automate-creation of modules.json file
pm-pramod-pisal Aug 26, 2020
5cd6930
resovled conflicts
pm-shashank-jain Aug 27, 2020
799d39a
Merge branch 'test_br_b2_20200826115925' into prebid_upgrade_4_4_0_20…
pm-shashank-jain Aug 27, 2020
97122b9
updated modules.json removed audienceNetworkBidAdapter
pm-shashank-jain Aug 27, 2020
021f2fe
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Sep 4, 2020
0e96826
Merge branch 'prebid_upgrade_4_4_0_20200826115924' of https://github.…
pm-shashank-jain Sep 4, 2020
a741d0b
wiid fix
pm-shashank-jain Sep 7, 2020
9e05b54
Targeting Keys
pm-shashank-jain Sep 15, 2020
1cf8729
Merge pull request #406 from PubMatic-OpenWrap/PB_KEYS_REPLACE_FIX
pm-shashank-jain Sep 15, 2020
63ef371
Merge pull request #407 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Sep 16, 2020
1e3abb4
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Sep 18, 2020
6e58f69
dg bid adapter
pm-shashank-jain Sep 18, 2020
f89af84
automate-creation of modules.json file
pm-pramod-pisal Sep 23, 2020
509033d
Merge branch 'prebid_upgrade_4_9_0_20200923150031' into test_br_b2_20…
pm-shashank-jain Sep 23, 2020
41f489b
Merge pull request #408 from PubMatic-OpenWrap/test_br_b2_20200923150032
pm-shashank-jain Sep 23, 2020
d6e208e
fixes for dfp
pm-shashank-jain Sep 23, 2020
1d9ea66
removed audienceNetwork from modules.json
pm-shashank-jain Sep 24, 2020
ddb104b
Fix for UOE-5694
pm-shashank-jain Sep 29, 2020
c966f54
Fix for test cases
pm-shashank-jain Sep 29, 2020
5746b4d
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Sep 29, 2020
1d673a9
Merge branch 'prebid_upgrade_4_9_0_20200923150031' of https://github.…
pm-shashank-jain Sep 29, 2020
dd9e45d
regex support
pm-harshad-mane Sep 30, 2020
f1aae1a
Merge pull request #410 from PubMatic-OpenWrap/pm_analytics_regex
pm-shashank-jain Oct 5, 2020
b27bbbf
Merge pull request #409 from PubMatic-OpenWrap/staged_nightly
pm-shashank-jain Oct 7, 2020
b27da83
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 7, 2020
42af549
Merge pull request #411 from PubMatic-OpenWrap/feature/secondaryAlias
pm-shashank-jain Oct 13, 2020
16416a4
OpenWrap Nightly Release v21.1.0 (#417)
pm-shashank-jain Oct 28, 2020
ada679a
Merge branch 'nightly' of https://github.com/PubMatic-OpenWrap/Prebid…
pm-shashank-jain Oct 28, 2020
1426a29
Removing OW PB Same Changes regarding device as it will be releaed in Q1
pm-shashank-jain Oct 28, 2020
d65bcb7
Log SSPId in piid for pubmatic
pm-shashank-jain Nov 4, 2020
71d2f37
OpenWrap Release v21.3.0 (#426)
pm-shashank-jain Nov 25, 2020
b0483b0
Staged nightly (#427)
pm-manasi-moghe Dec 8, 2020
35bd170
fix for id5 partner's paramName change in hasRequiredConfig function …
pm-manasi-moghe Dec 14, 2020
12e8454
OpenWrap Release v 21.5.0 (#434)
pm-shashank-jain Jan 3, 2021
1e4e549
OpenWrap Release 21.6.0 (#440)
pm-shashank-jain Jan 18, 2021
677fb60
Fix for Updated KGPV and different Bid Id (#443) (#444)
pm-shashank-jain Jan 27, 2021
0ec0f12
Deleting adagio for Build Issue (#446)
pm-shashank-jain Feb 9, 2021
69f97e8
OpenWrap Release 21.8.0 (#447)
pm-shashank-jain Feb 10, 2021
a5226d8
Prebid Upgrade to 4.25 (#451)
pm-shashank-jain Mar 2, 2021
94f1d79
Size Mapping Fix & Eids Fix (#453)
pm-shashank-jain Mar 4, 2021
fc7e4a9
Merged changes
Apr 5, 2021
431e819
merge issue changes
Apr 5, 2021
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
107 changes: 79 additions & 28 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
/* eslint-disable no-console */
'use strict';

var _ = require('lodash');
console.time('Loading Plugins in Prebid');
var argv = require('yargs').argv;
var gulp = require('gulp');
var gutil = require('gulp-util');
var connect = require('gulp-connect');
var webpack = require('webpack');
var webpackStream = require('webpack-stream');
var uglify = require('gulp-uglify');
var gulpClean = require('gulp-clean');
var KarmaServer = require('karma').Server;
var karmaConfMaker = require('./karma.conf.maker');
var opens = require('opn');
var webpackConfig = require('./webpack.conf');
var helpers = require('./gulpHelpers');
// var gutil = require('gulp-util');
// var connect = require('gulp-connect');
// var webpack = require('webpack');
// var webpackStream = require('webpack-stream');
// var uglify = require('gulp-uglify');
// var gulpClean = require('gulp-clean');
// var KarmaServer = require('karma').Server;
// var karmaConfMaker = require('./karma.conf.maker');
// var opens = require('opn');
// var webpackConfig = require('./webpack.conf');
// var helpers = require('./gulpHelpers');
var concat = require('gulp-concat');
var header = require('gulp-header');
var footer = require('gulp-footer');
// var header = require('gulp-header');
// var footer = require('gulp-footer');
var replace = require('gulp-replace');
var shell = require('gulp-shell');
var eslint = require('gulp-eslint');
var gulpif = require('gulp-if');
var sourcemaps = require('gulp-sourcemaps');
var through = require('through2');
var fs = require('fs');
var jsEscape = require('gulp-js-escape');
// var shell = require('gulp-shell');
// var eslint = require('gulp-eslint');
// var gulpif = require('gulp-if');
// var sourcemaps = require('gulp-sourcemaps');
// var through = require('through2');
// var fs = require('fs');
// var jsEscape = require('gulp-js-escape');
const path = require('path');
const execa = require('execa');

var prebid = require('./package.json');
var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10);
var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + '\nModules: <%= modules %> */\n';
var port = 9999;
console.timeEnd('Loading Plugins in Prebid');
const FAKE_SERVER_HOST = argv.host ? argv.host : 'localhost';
const FAKE_SERVER_PORT = 4444;
const { spawn } = require('child_process');
Expand All @@ -49,6 +49,7 @@ function bundleToStdout() {
bundleToStdout.displayName = 'bundle-to-stdout';

function clean() {
var gulpClean = require('gulp-clean');
return gulp.src(['build'], {
read: false,
allowEmpty: true
Expand All @@ -58,13 +59,18 @@ function clean() {

// Dependant task for building postbid. It escapes postbid-config file.
function escapePostbidConfig() {
var jsEscape = require('gulp-js-escape');

gulp.src('./integrationExamples/postbid/oas/postbid-config.js')
.pipe(jsEscape())
.pipe(gulp.dest('build/postbid/'));
};
escapePostbidConfig.displayName = 'escape-postbid-config';

function lint(done) {
var eslint = require('gulp-eslint');
var gulpif = require('gulp-if');

if (argv.nolint) {
return done();
}
Expand All @@ -80,6 +86,9 @@ function lint(done) {

// View the code coverage report in the browser.
function viewCoverage(done) {
var connect = require('gulp-connect');
var opens = require('opn');

var coveragePort = 1999;
var mylocalhost = (argv.host) ? argv.host : 'localhost';

Expand Down Expand Up @@ -110,6 +119,8 @@ viewReview.displayName = 'view-review';

// Watch Task with Live Reload
function watch(done) {
var connect = require('gulp-connect');

var mainWatcher = gulp.watch([
'src/**/*.js',
'modules/**/*.js',
Expand All @@ -135,6 +146,13 @@ function watch(done) {
};

function makeDevpackPkg() {
var _ = require('lodash');
var connect = require('gulp-connect');
var webpack = require('webpack');
var webpackStream = require('webpack-stream');
var webpackConfig = require('./webpack.conf');
var helpers = require('./gulpHelpers');

var cloned = _.cloneDeep(webpackConfig);
cloned.devtool = 'source-map';
var externalModules = helpers.getArgModules();
Expand All @@ -150,6 +168,15 @@ function makeDevpackPkg() {
}

function makeWebpackPkg() {
var _ = require('lodash');
var webpack = require('webpack');
var webpackStream = require('webpack-stream');
var uglify = require('gulp-uglify');
var webpackConfig = require('./webpack.conf');
var helpers = require('./gulpHelpers');
var header = require('gulp-header');
var gulpif = require('gulp-if');

var cloned = _.cloneDeep(webpackConfig);
delete cloned.devtool;

Expand All @@ -176,6 +203,8 @@ function gulpBundle(dev) {
}

function nodeBundle(modules) {
var through = require('through2');

return new Promise((resolve, reject) => {
bundle(false, modules)
.on('error', (err) => {
Expand All @@ -189,9 +218,17 @@ function nodeBundle(modules) {
}

function bundle(dev, moduleArr) {
// console.time('Loading Plugins for Prebid');
var _ = require('lodash');
var gutil = require('gulp-util');
var helpers = require('./gulpHelpers');
var footer = require('gulp-footer');
var gulpif = require('gulp-if');
var sourcemaps = require('gulp-sourcemaps');
var modules = moduleArr || helpers.getArgModules();
var allModules = helpers.getModuleNames(modules);

// console.timeEnd('Loading Plugins for Prebid');
// console.time('Getting Modules for Prebid');
if (modules.length === 0) {
modules = allModules.filter(module => explicitModules.indexOf(module) === -1);
} else {
Expand All @@ -203,7 +240,8 @@ function bundle(dev, moduleArr) {
});
}
}

// console.timeEnd('Getting Modules for Prebid');
// console.time('Concating Starts');
var entries = [helpers.getBuiltPrebidCoreFile(dev)].concat(helpers.getBuiltModules(dev, modules));

var outputFileName = argv.bundleName ? argv.bundleName : 'prebid.js';
Expand All @@ -213,10 +251,10 @@ 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);

// gutil.log('Concatenating files:\n', entries);
// gutil.log('Appending ' + prebid.globalVarName + '.processQueue();');
// gutil.log('Generating bundle:', outputFileName);
// console.timeEnd('Concating Starts');
return gulp.src(
entries
)
Expand All @@ -242,6 +280,10 @@ function bundle(dev, moduleArr) {
// If --notest is given, it will immediately skip the test task (useful for developing changes with `gulp serve --notest`)

function test(done) {
var KarmaServer = require('karma').Server;
var karmaConfMaker = require('./karma.conf.maker');
var helpers = require('./gulpHelpers');

if (argv.notest) {
done();
} else if (argv.e2e) {
Expand Down Expand Up @@ -313,10 +355,15 @@ function newKarmaCallback(done) {

// If --file "<path-to-test-file>" is given, the task will only run tests in the specified file.
function testCoverage(done) {
var KarmaServer = require('karma').Server;
var karmaConfMaker = require('./karma.conf.maker');

new KarmaServer(karmaConfMaker(true, false, false, argv.file), newKarmaCallback(done)).start();
}

function coveralls() { // 2nd arg is a dependency: 'test' must be finished
var shell = require('gulp-shell');

// first send results of istanbul's test coverage to coveralls.io.
return gulp.src('gulpfile.js', { read: false }) // You have to give it a file, but you don't
// have to read it.
Expand All @@ -327,6 +374,8 @@ function coveralls() { // 2nd arg is a dependency: 'test' must be finished
// More info can be found here http://prebid.org/overview/what-is-post-bid.html

function buildPostbid() {
var fs = require('fs');

var fileContent = fs.readFileSync('./build/postbid/postbid-config.js', 'utf8');

return gulp.src('./integrationExamples/postbid/oas/postbid.js')
Expand All @@ -335,6 +384,8 @@ function buildPostbid() {
}

function setupE2e(done) {
var gutil = require('gulp-util');

if (!argv.host) {
throw new gutil.PluginError({
plugin: 'E2E test',
Expand Down
109 changes: 109 additions & 0 deletions integrationExamples/gpt/gdpr_iframe_hello_world.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<!--
This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
Prebid with the Google Publisher Tag.
It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
bids array inside the adUnits, and it will use your adapter to load an ad.
NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
set an alias in your /etc/hosts file so that you can load this page from a different domain.
-->

<html>
<head>
<script>
var PREBID_TIMEOUT = 700;

var adUnits = [{
code: 'div-gpt-ad-1460505748561-0',
sizes: [[300, 250], [300,600]],

// Replace this object to test a new Adapter!
bids: [{
bidder: 'appnexusAst',
params: {
placementId: '10433394'
}
}]

}];

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

</script>

<script type="text/javascript" src="../../build/dev/prebid.js" async></script>
<script>
var googletag = googletag || {};
googletag.cmd = googletag.cmd || [];
googletag.cmd.push(function() {
googletag.pubads().disableInitialLoad();
});

pbjs.que.push(function() {
pbjs.addAdUnits(adUnits);
pbjs.setConfig({
consentManagement: {
cmpApi: 'iab',
timeout: 5000,
allowAuctionWithoutConsent: false
},
pubcid: {
enable: false
},
debug: true
});
pbjs.requestBids({
bidsBackHandler: sendAdserverRequest
});
});

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();
// }, PREBID_TIMEOUT);

</script>

<script>
(function () {
var gads = document.createElement('script');
gads.async = true;
gads.type = 'text/javascript';
var useSSL = 'https:' == document.location.protocol;
gads.src = (useSSL ? 'https:' : 'http:') +
'//www.googletagservices.com/tag/js/gpt.js';
var node = document.getElementsByTagName('script')[0];
node.parentNode.insertBefore(gads, node);
})();
</script>

<script>
googletag.cmd.push(function () {
googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());

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

<body>
<h2>Prebid.js Test</h2>
<h5>Div-1</h5>
<div id='div-gpt-ad-1460505748561-0'>
<script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
</script>
</div>
</body>
</html>
10 changes: 10 additions & 0 deletions integrationExamples/gpt/gdpr_iframe_test.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<html>
<head>
<script>window.__cmp = {config: {logging: 'debug'}}</script>
<script src="//acdn.adnxs.com/cmp/cmp.complete.bundle.js" async></script>
</head>

<body>
<iframe src="../../integrationExamples/gpt/gdpr_iframe_hello_world.html" style="height:800px; width:800px" id="myId"/>
</body>
</html>
Loading