Merge branch 'prebid:master' into master

.babelrc.js

@@ -16,12 +16,9 @@ module.exports = {
  {
  "targets": {
  "browsers": [
- "chrome >= 75",
- "safari >=10",
- "edge >= 70",
- "ff >= 70",
- "ie >= 11",
- "ios >= 11"
+ ">0.25%",
+ "not ie 11",
+ "not op_mini all"
  ]
  }
  }

.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+ARG VARIANT="12"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+# && apt-get -y install --no-install-recommends <your-package-list-here>
+
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
+RUN apt update
+RUN apt install -y google-chrome-stable xvfb

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/javascript-node
+{
+ "name": "Ubuntu",
+
+ "build": {
+ "dockerfile": "Dockerfile", 
+ "args": { "VARIANT": "12" }
+ },
+
+ "postCreateCommand": "bash .devcontainer/postCreate.sh",
+
+ // Set *default* container specific settings.json values on container create.
+ "settings": {},
+
+
+ // Add the IDs of extensions you want installed when the container is created.
+ "extensions": [
+ "nickdodd79.gulptasks"
+ ],
+
+ // 9999 is web server, 9876 is karma
+ "forwardPorts": [9876, 9999],
+
+ // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+ "remoteUser": "node"
+}

.devcontainer/postCreate.sh

@@ -0,0 +1,6 @@
+echo "Post Create Starting"
+
+nvm install
+nvm use
+npm install gulp-cli -g
+npm ci

README.md

@@ -1,6 +1,5 @@
 [![Build Status](https://circleci.com/gh/prebid/Prebid.js.svg?style=svg)](https://circleci.com/gh/prebid/Prebid.js)
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open")
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Average time to resolve an issue")
 [![Code Climate](https://codeclimate.com/github/prebid/Prebid.js/badges/gpa.svg)](https://codeclimate.com/github/prebid/Prebid.js)
 [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
 [![devDependencies Status](https://david-dm.org/prebid/Prebid.js/dev-status.svg)](https://david-dm.org/prebid/Prebid.js?type=dev)
@@ -60,6 +59,8 @@ module.exports = {
  loader: 'babel-loader',
  // presets and plugins for Prebid.js must be manually specified separate from your other babel rule.
  // this can be accomplished by requiring prebid's .babelrc.js file (requires Babel 7 and Node v8.9.0+)
+ // as of Prebid 6, babelrc.js only targets modern browsers. One can change the targets and build for
+ // older browsers if they prefer, but integration tests on ie11 were removed in Prebid.js 6.0
  options: require('prebid.js/.babelrc.js')
  }
  }
@@ -152,7 +153,7 @@ Building with just these adapters will result in a smaller bundle which should a
 
 **Build standalone prebid.js**
 
-- Clone the repo, run `npm install`
+- Clone the repo, run `npm ci`
 - Then run the build:
 
   $ gulp build --modules=openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter
@@ -315,7 +316,7 @@ For instructions on writing tests for Prebid.js, see [Testing Prebid.js](http://
 
 ### Supported Browsers
 
-Prebid.js is supported on IE11 and modern browsers.
+Prebid.js is supported on IE11 and modern browsers until 5.x. 6.x+ transpiles to target >0.25%; not Opera Mini; not IE11. 
 
 ### Governance
 Review our governance model [here](https://github.com/prebid/Prebid.js/tree/master/governance.md).

allowedModules.js

@@ -5,7 +5,8 @@ const sharedWhiteList = [
  'core-js-pure/features/set', // ie11 supports Set but not Set#values
  'core-js-pure/features/string/includes', // no ie11
  'core-js-pure/features/number/is-integer', // no ie11,
- 'core-js-pure/features/array/from' // no ie11
+ 'core-js-pure/features/array/from', // no ie11
+ 'core-js-pure/web/url-search-params' // no ie11
 ];
 
 module.exports = {

browsers.json

@@ -15,14 +15,6 @@
  "device": null,
  "os": "Windows"
  },
- "bs_ie_11_windows_10": {
- "base": "BrowserStack",
- "os_version": "10",
- "browser": "ie",
- "browser_version": "11.0",
- "device": null,
- "os": "Windows"
- },
  "bs_chrome_90_windows_10": {
  "base": "BrowserStack",
  "os_version": "10",
@@ -71,4 +63,5 @@
  "device": null,
  "os": "OS X"
  }
+
 }

integrationExamples/gpt/adloox.html

@@ -64,9 +64,11 @@
  playerSize: [ 640, 480 ]
  }
  },
- fpd: {
- context: {
- pbAdSlot: '/19968336/prebid_cache_video_adunit'
+ ortb2Imp: {
+ ext: {
+ data: {
+ pbadslot: '/19968336/prebid_cache_video_adunit'
+ }
  }
  },
  bids: [
@@ -106,7 +108,8 @@
  pbjs.initAdserverSet = true;
 
  googletag.cmd.push(function() {
- pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync(adUnits);
+ const adUnitCodes = adUnits.map(adUnit => adUnit.code);
+ pbjs.setTargetingForGPTAsync(adUnitCodes);
  googletag.pubads().refresh();
  });
 
@@ -135,12 +138,24 @@
  }
 
  // optionally wrap with googletag to have gpt-pre-auction
- // automatically populate Prebid Ad Slot (pbAdSlot)
+ // automatically populate Prebid Ad Slot (pbadslot)
  // https://docs.prebid.org/dev-docs/modules/gpt-pre-auction.html
- // alternatively remove wrapping and set AdUnit.fpd.context.pbAdSlot
+ // alternatively remove wrapping and set AdUnit.ortb2Imp.ext.data.pbadslot
  googletag.cmd.push(function() {
  pbjs.que.push(function() {
  pbjs.setConfig({
+ realTimeData: {
+ auctionDelay: AUCTION_DELAY,
+ dataProviders: [
+ {
+ name: 'adloox',
+ params: { // optional, defaults shown
+ thresholds: [ 50, 60, 70, 80, 90 ],
+ slotinpath: false
+ }
+ }
+ ]
+ },
  instreamTracking: {
  enabled: true
  },