Merge pull request #20 from aol/release/2.11.0

Release/2.11.0

.babelrc

@@ -1,8 +1,19 @@
 {
- "presets": ["es2015"],
+ "presets": [
+ ["env", {
+ "targets": {
+ "browsers": [
+ "chrome >= 61", 
+ "safari >=8", 
+ "edge >= 14", 
+ "ff >= 57", 
+ "ie >= 10",
+ "ios >= 8"
+ ]
+ }
+ }]
+ ],
  "plugins": [
- "transform-object-assign",
- "transform-es3-property-literals",
- "transform-es3-member-expression-literals"
+ "transform-object-assign"
  ]
 }

.eslintrc.js

@@ -3,6 +3,13 @@ module.exports = {
  "browser": true,
  "commonjs": true
  },
+ "settings": {
+ "import/resolver": {
+ "node": {
+ "moduleDirectory": ["node_modules", "./"]
+ }
+ }
+ },
  "extends": "standard",
  "globals": {
  "$$PREBID_GLOBAL$$": false

.github/stale.yml

@@ -7,8 +7,9 @@ exemptLabels:
  - pinned
  - security
  - bug
+ - feature
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
  This issue has been automatically marked as stale because it has not had

.travis.yml

@@ -1,19 +1,28 @@
 sudo: required
-
 dist: trusty
-
 language: node_js
-
 node_js:
- - "7.0"
-
-# See https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-the-Chrome-addon-in-the-headless-mode
+- '7.0'
+env:
+- BROWSERSTACK_USERNAME=info184
 addons:
- chrome: stable
-
+ chrome: stable,
+ browserstack:
+ username: info184
+ access_key:
+ secure: Ru286R4pMcEIRKwb2AoaaJY6lEKIzeZraxY7CtbOP4ykNk7uqsnyitk4QwxpCCh0n35b71m30okW6ZmZnl0lJXhOMdYoSOYBAnUw2Vn7Y93oMSKIC5dc2/qmtF1t2b1qX65/Ont2iJUj+UY8VQw5Hk2vIT4/5wifYPBnV5ILK4AI7SVk/ma7OzK4rkp3WThlouddctAd7tx4O3YIyJKDi9lkfcMA0pnH4OZSOlDClRLIy50Q1NE+iyqHtWFZK1TwJ+IhQbSsCLbuyQJBRnyJJEftNmtrs5MCZt/9pwFDj7c8+o11F6HCsTBYFkehFRfbKnmhCc1G+bsNXY8OxIWwEHeuVmSGK7TDPYcPPQBc03mcQ1fY/IPNQOdsVJ/n8RsG2u0IU2CF2hhkuNFzeov7dOHljanc45NKOrLdjwzP1aZCAUvLquOTzvmdF23nJhMs8UO+Du4kTK5VfmKyz1MC91E40a0Q15+O4qmS39rNOlwhxPJSfuxxL1jKVPJ7PsFbTkGM8M/XPJ6dyGLufy225HjdLdJTAOa5BZ4st+nXH/AzqHzy6a2I5vTmAz1j4gHLgVU+iNxAkX8znb25s3Rs1ZuFVj+aBSBmNoQA1FA5f/uXWeruTdDig7ksp+XdjsjLm9Md8cWwYaEn04FYj1ztJrylrEMfnc0Kcs6zQ3fll1g=
 before_install:
- - npm install -g gulp
- - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
-
-script:
- - gulp run-tests
+- npm install -g gulp
+- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
+script: |-
+ if [[ ${TRAVIS_PULL_REQUEST} == "false" ]]; then
+ gulp test --browserstack
+ else
+ gulp run-tests
+ fi
+notifications:
+ slack:
+ on_success: never
+ on_failure: always
+ on_pull_requests: false
+ secure: C4O77VtABLE5DiPDeKGqUcsBdTBMNjQRLc8iBfSp231e95K1rA/JXJJEQN/lVhhiFJyPhxueE0i6cR0zD8uAMC8HRShGGfPjEZ7f6glawPzap2wFwjAyVkknYV+BMKcX0jvn7CiSKBj+zTbHQfn/Uj3nMSbDZQIdbNDiFGh4NuDr3/Yd/efhsw/miExlSPSWqGVCKV3WPpTrU3BRpLNDq4sZMXP9ORZxGK7ER3tsMiD2z05YpvC+mibESJxaY0qsuQu1y1Gu65QLPe5ocw405btJwqYn+b4YFpUd2GbLNhjtLzsc+OKrD0DWuEI0bxePQUYDga5wR6g4cdZaXU3ixDjee7sJbDeVJAuykGlfZ4A1k+fQIgPs3s9XMHaeG9AfDhFiZ/UoNdonzos1iSa/Y1TzHIXp1wnbHKT5HUWWPFNb5PzJxHEtHbm3jwOH4iK8VAq94ec16M2aqUAj7muiqcrTlYa5rs6jRlXo/TRymFnbQRdBT7eLmLNDQD35yR1Y+4mxHqKi+3189yG9RE+uwIlB+9HZFgNbioOApB+jarKC6M0qEgn0bHxkpJBP8JmNCA84U0ZUzyPvuMGsRbisAmKoUsU8C6cq59QDfBTcCTvKXK6r+6f23iRGieoGSbTxYQj46QkykpbWU0WstQDQsZL3L316uZecOVZmWKBRxPs=

CHANGELOG

@@ -1,3 +1,31 @@
+AOL Prebid 2.11.0
+----------------
+Updated to Prebid 1.11.0
+Added GDPR support fo AOL analytics adapter.
+Added passing GDPR flag when consent string is not present.
+
+
+AOL Prebid 2.10.0
+----------------
+Updated to Prebid 1.10.0
+
+
+AOL Prebid 2.9.0
+----------------
+Updated to Prebid 1.9.0
+Added GDPR support for AOL adapter.
+
+
+AOL Prebid 2.8.0
+----------------
+Updated to Prebid 1.8.0
+
+
+AOL Prebid 2.7.0
+----------------
+Updated to Prebid 1.7.0
+
+
 AOL Prebid 2.6.0
 ----------------
 Updated to Prebid 1.6.0

PR_REVIEW.md

@@ -34,6 +34,7 @@ For modules and core platform updates, the initial reviewer should request an ad
 - Adapters may not use the $$PREBID_GLOBAL$$ variable
 - All adapters must support the creation of multiple concurrent instances. This means, for example, that adapters cannot rely on mutable global variables.
 - Adapters may not globally override or default the standard ad server targeting values: hb_adid, hb_bidder, hb_pb, hb_deal, or hb_size, hb_source, hb_format.
+- After a new adapter is approved, let the submitter know they may open a PR in the [headerbid-expert repository](https://github.com/prebid/headerbid-expert) to have their adapter recognized by the [Headerbid Expert extension](https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop). The PR should be to the [bidder patterns file](https://github.com/prebid/headerbid-expert/blob/master/bidderPatterns.js), adding an entry with their adapter's name and the url the adapter uses to send and receive bid responses.
 
 ## Ticket Coordinator
 

gulpfile.js

@@ -123,7 +123,11 @@ function newKarmaCallback(done) {
  if (exitCode) {
  done(new Error('Karma tests failed with exit code ' + exitCode));
  } else {
- done();
+ if (argv.browserstack) {
+ process.exit(0);
+ } else {
+ done();
+ }
  }
  }
 }

integrationExamples/gpt/gdpr_hello_world.html

@@ -0,0 +1,103 @@
+<html>
+ <head>
+ <script>window.__cmp = {config: {logging: 'debug'}}</script>
+ <script src="//acdn.adnxs.com/cmp/cmp.complete.bundle.js" async></script>
+
+ <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: true
+ },
+ pubcid: {
+ enable: false
+ }
+ });
+ 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();
+ // console.log('timeout in main pbjs fired');
+ // }, 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>