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

.circleci/config.yml

@@ -7,7 +7,7 @@ aliases:
   - &environment
       docker:
         # specify the version you desire here
-        - image: circleci/node:8.9.0
+        - image: circleci/node:12.16.1
 
         # Specify service dependencies here if necessary
         # CircleCI maintains a library of pre-built images

.nvmrc

@@ -1 +1 @@
-8.9
+12.16.1

README.md

@@ -112,7 +112,7 @@ prebid.requestBids({
     $ cd Prebid.js
     $ npm install
 
-*Note:* You need to have `NodeJS` 8.9.x or greater installed.
+*Note:* You need to have `NodeJS` 12.16.1 or greater installed.
 
 *Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1.  To comply with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm install`.  This shouldn't impact any other projects you may work on that use an earlier version of gulp in its setup.
 

gulpfile.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 'use strict';
 
 var _ = require('lodash');
@@ -32,8 +33,8 @@ var prebid = require('./package.json');
 var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10);
 var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + ' */\n';
 var port = 9999;
-const mockServerPort = 4444;
-const host = argv.host ? argv.host : 'localhost';
+const FAKE_SERVER_HOST = argv.host ? argv.host : 'localhost';
+const FAKE_SERVER_PORT = 4444;
 const { spawn } = require('child_process');
 
 // these modules must be explicitly listed in --modules to be included in the build, won't be part of "all" modules
@@ -238,25 +239,25 @@ function test(done) {
       ];
     }
 
-    //run mock-server
-    const mockServer = spawn('node', ['./test/mock-server/index.js', '--port=' + mockServerPort]);
-    mockServer.stdout.on('data', (data) => {
+    // run fake-server
+    const fakeServer = spawn('node', ['./test/fake-server/index.js', `--port=${FAKE_SERVER_PORT}`]);
+    fakeServer.stdout.on('data', (data) => {
       console.log(`stdout: ${data}`);
     });
-    mockServer.stderr.on('data', (data) => {
+    fakeServer.stderr.on('data', (data) => {
       console.log(`stderr: ${data}`);
     });
 
     execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
       .then(stdout => {
-        // kill mock server
-        mockServer.kill('SIGINT');
+        // kill fake server
+        fakeServer.kill('SIGINT');
         done();
         process.exit(0);
       })
       .catch(err => {
-        // kill mock server
-        mockServer.kill('SIGINT');
+        // kill fake server
+        fakeServer.kill('SIGINT');
         done(new Error(`Tests failed with error: ${err}`));
         process.exit(1);
       });
@@ -326,11 +327,27 @@ function setupE2e(done) {
   done();
 }
 
-gulp.task('updatepath', function () {
+function injectFakeServerEndpoint() {
   return gulp.src(['build/dist/*.js'])
-    .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', 'http://' + host + ':' + mockServerPort + '/'))
+    .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', `http://${FAKE_SERVER_HOST}:${FAKE_SERVER_PORT}`))
     .pipe(gulp.dest('build/dist'));
-});
+}
+
+function injectFakeServerEndpointDev() {
+  return gulp.src(['build/dev/*.js'])
+    .pipe(replace('https://ib.adnxs.com/ut/v3/prebid', `http://${FAKE_SERVER_HOST}:${FAKE_SERVER_PORT}`))
+    .pipe(gulp.dest('build/dev'));
+}
+
+function startFakeServer() {
+  const fakeServer = spawn('node', ['./test/fake-server/index.js', `--port=${FAKE_SERVER_PORT}`]);
+    fakeServer.stdout.on('data', (data) => {
+      console.log(`stdout: ${data}`);
+    });
+    fakeServer.stderr.on('data', (data) => {
+      console.log(`stderr: ${data}`);
+    });
+}
 
 // support tasks
 gulp.task(lint);
@@ -355,9 +372,11 @@ gulp.task('build', gulp.series(clean, 'build-bundle-prod'));
 gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 
 gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test)));
+gulp.task('serve-fake', gulp.series(clean, gulp.parallel('build-bundle-dev', watch), injectFakeServerEndpointDev, test, startFakeServer));
+
 gulp.task('default', gulp.series(clean, makeWebpackPkg));
 
-gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-prod', watch), 'updatepath', test));
+gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-prod', watch), injectFakeServerEndpoint, test));
 // other tasks
 gulp.task(bundleToStdout);
 gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step

integrationExamples/gpt/x-domain/creative.html

@@ -6,7 +6,6 @@
 var urlParser = document.createElement('a');
 urlParser.href = '%%PATTERN:url%%';
 var publisherDomain = urlParser.protocol + '//' + urlParser.hostname;
-var adServerDomain = windowLocation.protocol + '//tpc.googlesyndication.com';
 
 function renderAd(ev) {
     var key = ev.message ? 'message' : 'data';
@@ -58,8 +57,7 @@
 function requestAdFromPrebid() {
   var message = JSON.stringify({
     message: 'Prebid Request',
-    adId: '%%PATTERN:hb_adid%%',
-    adServerDomain: adServerDomain
+    adId: '%%PATTERN:hb_adid%%'
   });
   window.parent.postMessage(message, publisherDomain);
 }

integrationExamples/longform/basic_w_bidderSettings.html

@@ -5,6 +5,10 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
+  <script src="longformTestUtils.js"></script>
+  <script>
+    prebidTestUtils.setMockCategories();
+  </script>
   <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -20,10 +24,9 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" />
   <!-- <script type="text/javascript" src="//adm.fwmrm.net/p/vitest-js/AdManager.js"></script> -->
-  <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script>
+  <!-- <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script> -->
   <!-- <script type="text/javascript" src="player.js"></script> -->
   <link rel="stylesheet" href="longform_testpages_style.css">
-  <script src="longformTestUtils.js"></script>
   <script>
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];

integrationExamples/longform/basic_w_custom_adserver_translation.html

@@ -5,6 +5,10 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
+  <script src="longformTestUtils.js"></script>
+  <script>
+    prebidTestUtils.setMockCategories();
+  </script>
   <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -20,10 +24,9 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" />
   <!-- <script type="text/javascript" src="//adm.fwmrm.net/p/vitest-js/AdManager.js"></script> -->
-  <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script>
+  <!-- <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script> -->
   <!-- <script type="text/javascript" src="player.js"></script> -->
   <link rel="stylesheet" href="longform_testpages_style.css">
-  <script src="longformTestUtils.js"></script>
   <script>
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];

integrationExamples/longform/basic_w_priceGran.html

@@ -5,6 +5,10 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
+  <script src="longformTestUtils.js"></script>
+  <script>
+    prebidTestUtils.setMockCategories();
+  </script>
   <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -20,10 +24,9 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" />
   <!-- <script type="text/javascript" src="//adm.fwmrm.net/p/vitest-js/AdManager.js"></script> -->
-  <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script>
+  <!-- <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script> -->
   <!-- <script type="text/javascript" src="player.js"></script> -->
   <link rel="stylesheet" href="longform_testpages_style.css">
-  <script src="longformTestUtils.js"></script>
   <script>
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];

integrationExamples/longform/basic_w_requireExactDuration.html

@@ -5,6 +5,10 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
+  <script src="longformTestUtils.js"></script>
+  <script>
+    prebidTestUtils.setMockCategories();
+  </script>
   <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -20,10 +24,9 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" />
   <!-- <script type="text/javascript" src="//adm.fwmrm.net/p/vitest-js/AdManager.js"></script> -->
-  <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script>
+  <!-- <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script> -->
   <!-- <script type="text/javascript" src="player.js"></script> -->
   <link rel="stylesheet" href="longform_testpages_style.css">
-  <script src="longformTestUtils.js"></script>
   <script>
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];

integrationExamples/longform/basic_wo_brandCategoryExclusion.html

@@ -4,6 +4,10 @@
 <head>
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <script src="longformTestUtils.js"></script>
+  <script>
+    prebidTestUtils.setMockCategories();
+  </script>
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
   <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
@@ -20,10 +24,9 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" />
   <!-- <script type="text/javascript" src="//adm.fwmrm.net/p/vitest-js/AdManager.js"></script> -->
-  <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script>
+  <!-- <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script> -->
   <!-- <script type="text/javascript" src="player.js"></script> -->
   <link rel="stylesheet" href="longform_testpages_style.css">
-  <script src="longformTestUtils.js"></script>
   <script>
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];

integrationExamples/longform/basic_wo_requireExactDuration.html

@@ -5,6 +5,10 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
+  <script src="longformTestUtils.js"></script>
+  <script>
+    prebidTestUtils.setMockCategories();
+  </script>
   <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
@@ -20,10 +24,9 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" />
   <!-- <script type="text/javascript" src="//adm.fwmrm.net/p/vitest-js/AdManager.js"></script> -->
-  <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script>
+  <!-- <script type="text/javascript" src="https://mssl.fwmrm.net/libs/adm/6.24.0/AdManager-debug.js"></script> -->
   <!-- <script type="text/javascript" src="player.js"></script> -->
   <link rel="stylesheet" href="longform_testpages_style.css">
-  <script src="longformTestUtils.js"></script>
   <script>
     var pbjs = pbjs || {};
     pbjs.que = pbjs.que || [];