Merge branch 'master' of https://github.com/prebid/Prebid.js

* 'master' of https://github.com/prebid/Prebid.js: (76 commits)
  Updated adUnitCode (prebid#2262)
  vastUrl is set based on nurl for video. (prebid#2249)
  Added ad id to a4g bid (prebid#2250)
  Add billing url (burl) support (prebid#2246)
  Fix: add mediatype in bid response (prebid#2260)
  use b64EncodeUnicode to encode strings with unicode chars in them (prebid#2245)
  create RELEASE_SCHEDULE.md (prebid#2255)
  Update Platform.io Adapter (prebid#2230)
  Update Lifestreet adapter to 1.0 (prebid#2197)
  PBS adapter not sending app or device (prebid#2206)
  Fix prebid#2229 - Edge cookie string form (prebid#2236)
  Add Invibes Adapter (prebid#2202)
  Increment pre version
  Prebid 1.5.0 Release
  Fix cross-platform test failures (prebid#2228)
  Fix uncahced video bids from multi-response array triggering callback early (prebid#2219)
  Add vuble adapter (prebid#2201)
  Update Vidazoo domain (prebid#2223)
  InSkin Bid Adapter: remove referrer field from request body (prebid#2217)
  Gamma Support UserSync Endpoint (prebid#2216)
  ...

.eslintrc.js

@@ -21,12 +21,9 @@ module.exports = {
     // See Issue #1111.
     "camelcase": "off",
     "eqeqeq": "off",
-    "no-control-regex": "off",
     "no-return-assign": "off",
     "no-throw-literal": "off",
     "no-undef": "off",
-    "no-use-before-define": "off",
     "no-useless-escape": "off",
-    "standard/no-callback-literal": "off",
   }
 };

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 14
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - bug
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# 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
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

CONTRIBUTING.md

@@ -48,9 +48,6 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
   - _Assert_: check that the expected results have occurred
     - e.g., use Chai assertions to check that the expected output is equal to the actual output
 - Test the public interface, not the internal implementation
-- If using global `pbjs` data structures in your test, take care to not completely overwrite them with your own data as that may affect other tests relying on those structures, e.g.:
-    - **OK**: `pbjs._bidsRequested.push(bidderRequestObject);`
-    - **NOT OK**: `pbjs._bidsRequested = [bidderRequestObject];`
 - If you need to check `adloader.loadScript` in a test, use a `stub` rather than a `spy`. `spy`s trigger a network call which can result in a `script error` and cause unrelated unit tests to fail. `stub`s will let you gather information about the `adloader.loadScript` call without affecting external resources
 - When writing tests you may use ES2015 syntax if desired
 

PR_REVIEW.md

@@ -17,7 +17,7 @@ For modules and core platform updates, the initial reviewer should request an ad
 - If all above is good, add a `LGTM` comment and request 1 additional core member to review.
 - Once there is 2 `LGTM` on the PR, merge to master
 - Ask the submitter to add a PR for documentation if applicable.
-- Add a line into the `draft release` notes for this submission. If no draft release is available, create one using [this template]( https://gist.github.com/mkendall07/c3af6f4691bed8a46738b3675cb5a479)
+- Add a line into the [draft release](https://github.com/prebid/Prebid.js/releases) notes for this submission. If no draft release is available, create one using [this template]( https://gist.github.com/mkendall07/c3af6f4691bed8a46738b3675cb5a479)
 
 ### New Adapter or updates to adapter process
 - Follow steps above for general review process. In addition, please verify the following:
@@ -33,6 +33,7 @@ For modules and core platform updates, the initial reviewer should request an ad
 - All user-sync (aka pixel) activity must be registered via the provided functions
 - 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.
 
 ## Ticket Coordinator
 

README.md

@@ -26,11 +26,7 @@ Working examples can be found in [the developer docs](http://prebid.org/dev-docs
 
     $ git clone https://github.com/prebid/Prebid.js.git
     $ cd Prebid.js
-    $ yarn install
-
-Prebid supports the `yarn` npm client. This is an alternative to using `npm` for package management, though `npm install` will continue to work as before.
-
-For more info, see [the Yarn documentation](https://yarnpkg.com).
+    $ npm install
 
 *Note:* You need to have `NodeJS` 4.x or greater installed.
 
@@ -60,11 +56,8 @@ For example, when running the serve command: `gulp serve --modules=openxBidAdapt
 Building with just these adapters will result in a smaller bundle which should allow your pages to load faster.
 
 **Build standalone prebid.js**
-Prebid now supports the `yarn` npm client. This is an alternative to using `npm` for package management, though `npm` will continue to work as before.
-
-For more info about yarn see https://yarnpkg.com
 
-- Clone the repo, run `yarn install`
+- Clone the repo, run `npm install`
 - Then run the build:
 
         $ gulp build --modules=openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter
@@ -82,11 +75,11 @@ With `modules.json` containing the following
 ]
 ```
 
-**Build prebid.js using Yarn for bundling**
+**Build prebid.js using npm for bundling**
 
-In case you'd like to explicitly show that your project uses `prebid.js` and want a reproducible build, consider adding it as an `yarn` dependency.
+In case you'd like to explicitly show that your project uses `prebid.js` and want a reproducible build, consider adding it as an `npm` dependency.
 
-- Add `prebid.js` as a `yarn` dependency of your project: `yarn add prebid.js`
+- Add `prebid.js` as a `npm` dependency of your project: `npm install prebid.js`
 - Run the `prebid.js` build under the `node_modules/prebid.js/` folder
 
         $ gulp build --modules=path/to/your/list-of-modules.json

RELEASE_SCHEDULE.md

@@ -0,0 +1,22 @@
+# Release Schedule
+
+We push a new release of Prebid.js every other week on Tuesday. During the adoption phase for 1.x, we are releasing updates for 1.x and 0.x at the same time.
+
+While the releases will be available immediately for those using direct Git access,
+it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.  
+
+You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)
+
+Announcements regarding releases will be made to the #headerbidding-dev channel in subredditadops.slack.com.
+
+# FAQs
+
+**1. Is there flexibility in the 2-week schedule?**
+
+If a major bug is found in the current release, a maintenance patch will be done as soon as possible.
+
+It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner.
+
+**2. What Pull Requests make it into a release?**
+
+Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md).

browsers.json

@@ -1,9 +1,9 @@
 {
-  "bs_ie_13_windows_10": {
+  "bs_ie_14_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "edge",
-    "browser_version": "13.0",
+    "browser_version": "14.0",
     "device": null,
     "os": "Windows"
   },
@@ -15,15 +15,15 @@
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_46_windows_10": {
+  "bs_firefox_56_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_51_windows_10": {
+  "bs_chrome_62_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
@@ -39,43 +39,35 @@
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_46_windows_8.1": {
+  "bs_firefox_56_windows_8.1": {
     "base": "BrowserStack",
     "os_version": "8.1",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_51_windows_8.1": {
+  "bs_chrome_62_windows_8.1": {
     "base": "BrowserStack",
     "os_version": "8.1",
     "browser": "chrome",
-    "browser_version": "51.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_ie_10_windows_8": {
-    "base": "BrowserStack",
-    "os_version": "8",
-    "browser": "ie",
-    "browser_version": "10.0",
+    "browser_version": "62.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_46_windows_8": {
+  "bs_firefox_56_windows_8": {
     "base": "BrowserStack",
     "os_version": "8",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_51_windows_8": {
+  "bs_chrome_62_windows_8": {
     "base": "BrowserStack",
     "os_version": "8",
     "browser": "chrome",
-    "browser_version": "51.0",
+    "browser_version": "62.0",
     "device": null,
     "os": "Windows"
   },
@@ -87,27 +79,19 @@
     "device": null,
     "os": "Windows"
   },
-  "bs_ie_10_windows_7": {
-    "base": "BrowserStack",
-    "os_version": "7",
-    "browser": "ie",
-    "browser_version": "10.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_firefox_46_windows_7": {
+  "bs_firefox_56_windows_7": {
     "base": "BrowserStack",
     "os_version": "7",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_51_windows_7": {
+  "bs_chrome_62_windows_7": {
     "base": "BrowserStack",
     "os_version": "7",
     "browser": "chrome",
-    "browser_version": "51.0",
+    "browser_version": "62.0",
     "device": null,
     "os": "Windows"
   },
@@ -127,19 +111,19 @@
     "device": null,
     "os": "OS X"
   },
-  "bs_firefox_46_mac_elcapitan": {
+  "bs_firefox_56_mac_elcapitan": {
     "base": "BrowserStack",
     "os_version": "El Capitan",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "OS X"
   },
-  "bs_chrome_51_mac_elcapitan": {
+  "bs_chrome_62_mac_elcapitan": {
     "base": "BrowserStack",
     "os_version": "El Capitan",
     "browser": "chrome",
-    "browser_version": "51.0",
+    "browser_version": "62.0",
     "device": null,
     "os": "OS X"
   },
@@ -151,15 +135,15 @@
     "device": null,
     "os": "OS X"
   },
-  "bs_firefox_46_mac_yosemite": {
+  "bs_firefox_56_mac_yosemite": {
     "base": "BrowserStack",
     "os_version": "Yosemite",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "OS X"
   },
-  "bs_chrome_51_mac_yosemite": {
+  "bs_chrome_62_mac_yosemite": {
     "base": "BrowserStack",
     "os_version": "Yosemite",
     "browser": "chrome",
@@ -175,11 +159,11 @@
     "device": null,
     "os": "OS X"
   },
-  "bs_firefox_46_mac_mavericks": {
+  "bs_firefox_56_mac_mavericks": {
     "base": "BrowserStack",
     "os_version": "Mavericks",
     "browser": "firefox",
-    "browser_version": "46.0",
+    "browser_version": "56.0",
     "device": null,
     "os": "OS X"
   },

integrationExamples/gpt/amp/README.md

@@ -1,3 +1,10 @@
+##WARNING
+The below documented method of deploying prebid on AMP requires remote.html
+This is being deprecated on March 29th. A new method the requires Prebid Server
+is being developed, see [Prebid Server](http://github.com/prebid/prebid-server).
+
+## Old method:
+
 This README provides steps to run amp example page.
 
 Add following entries to your hosts file

integrationExamples/gpt/hello_world.html

@@ -1,14 +1,10 @@
 <!--
-
   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>

karma.conf.maker.js

@@ -35,10 +35,11 @@ function newPluginsArray(browserstack) {
     'karma-expect',
     'karma-mocha',
     'karma-requirejs',
-    'karma-sinon-ie',
+    'karma-sinon',
     'karma-sourcemap-loader',
     'karma-spec-reporter',
     'karma-webpack',
+    'karma-mocha-reporter'
   ];
   if (browserstack) {
     plugins.push('karma-browserstack-launcher');
@@ -58,6 +59,8 @@ function setReporters(karmaConf, codeCoverage, browserstack) {
   if (browserstack) {
     karmaConf.reporters = ['spec'];
     karmaConf.specReporter = {
+      maxLogLines: 100,
+      suppressErrorSummary: false,
       suppressSkipped: false,
       suppressPassed: true
     };
@@ -95,10 +98,8 @@ function setBrowsers(karmaConf, browserstack) {
 module.exports = function(codeCoverage, browserstack, watchMode, file) {
   var webpackConfig = newWebpackConfig(codeCoverage);
   var plugins = newPluginsArray(browserstack);
-  var files = [
-    'test/helpers/prebidGlobal.js',
-    file ? file : 'test/**/*_spec.js'
-  ];
+
+  var files = file ? ['test/helpers/prebidGlobal.js', file] : ['test/test_index.js'];
   // This file opens the /debug.html tab automatically.
   // It has no real value unless you're running --watch, and intend to do some debugging in the browser.
   if (watchMode) {
@@ -113,7 +114,6 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
     webpackMiddleware: {
       noInfo: true
     },
-
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['es5-shim', 'mocha', 'expect', 'sinon'],
@@ -123,8 +123,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'test/**/*_spec.js': ['webpack', 'sourcemap'],
-      'test/helpers/prebidGlobal.js': ['webpack', 'sourcemap']
+      'test/test_index.js': ['webpack', 'sourcemap']
     },
 
     // web server port

modules/33acrossBidAdapter.js

@@ -4,7 +4,7 @@ const { config } = require('../src/config');
 
 const BIDDER_CODE = '33across';
 const END_POINT = 'https://ssc.33across.com/api/v1/hb';
-const SYNC_ENDPOINT = 'https://de.tynt.com/deb/v2?m=xch';
+const SYNC_ENDPOINT = 'https://de.tynt.com/deb/v2?m=xch&rt=html';
 
 // All this assumes that only one bid is ever returned by ttx
 function _createBidResponse(response) {