Merge pull request #10 from prebid/master

Merge upstream into fork
permutive · Nov 3, 2021 · 3a3c714 · 3a3c714
2 parents 659a971 + 906e8c4
commit 3a3c714
Show file tree

Hide file tree

Showing 694 changed files with 86,771 additions and 48,262 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -14,16 +14,7 @@ module.exports = {
     [
       useLocal('@babel/preset-env'),
       {
-        "targets": {
-          "browsers": [
-            "chrome >= 61",
-            "safari >=8",
-            "edge >= 14",
-            "ff >= 57",
-            "ie >= 11",
-            "ios >= 8"
-          ]
-        }
+        "useBuiltIns": "entry"
       }
     ]
   ],

diff --git a/.devcontainer/Dockerfile b/.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
diff --git a/.devcontainer/devcontainer.json b/.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"
+}
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
@@ -0,0 +1,6 @@
+echo "Post Create Starting"
+
+nvm install
+nvm use
+npm install gulp-cli -g
+npm ci
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,50 +1,53 @@
 
-const allowedModules = require("./allowedModules");
+const allowedModules = require('./allowedModules.js');
 
 module.exports = {
-  "env": {
-    "browser": true,
-    "commonjs": true
+  env: {
+    browser: true,
+    commonjs: true
   },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "moduleDirectory": ["node_modules", "./"]
+  settings: {
+    'import/resolver': {
+      node: {
+        moduleDirectory: ['node_modules', './']
       }
     }
   },
-  "extends": "standard",
-  "plugins": [
-    "prebid",
-    "import"
+  extends: 'standard',
+  plugins: [
+    'prebid',
+    'import'
   ],
-  "globals": {
-    "$$PREBID_GLOBAL$$": false
+  globals: {
+    '$$PREBID_GLOBAL$$': false,
+    'BROWSERSTACK_USERNAME': false,
+    'BROWSERSTACK_KEY': false
   },
-  "parserOptions": {
-    "sourceType": "module"
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 2018,
   },
-  "rules": {
-    "comma-dangle": "off",
-    "semi": "off",
-    "space-before-function-paren": "off",
-    "import/extensions": ["error", "ignorePackages"],
+  rules: {
+    'comma-dangle': 'off',
+    semi: 'off',
+    'space-before-function-paren': 'off',
+    'import/extensions': ['error', 'ignorePackages'],
 
     // Exceptions below this line are temporary, so that eslint can be added into the CI process.
     // Violations of these styles should be fixed, and the exceptions removed over time.
     //
     // See Issue #1111.
-    "eqeqeq": "off",
-    "no-return-assign": "off",
-    "no-throw-literal": "off",
-    "no-undef": 2,
-    "no-useless-escape": "off",
-    "no-console": "error"
+    eqeqeq: 'off',
+    'no-return-assign': 'off',
+    'no-throw-literal': 'off',
+    'no-undef': 2,
+    'no-useless-escape': 'off',
+    'no-console': 'error'
   },
-  "overrides": Object.keys(allowedModules).map((key) => ({
-    "files": key + "/**/*.js",
-    "rules": {
-      "prebid/validate-imports": ["error", allowedModules[key]]
+  overrides: Object.keys(allowedModules).map((key) => ({
+    files: key + '/**/*.js',
+    rules: {
+      'prebid/validate-imports': ['error', allowedModules[key]]
     }
   }))
 };
diff --git a/README.md b/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).
diff --git a/allowedModules.js b/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 = {

diff --git a/browsers.json b/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"
   }
+
 }
diff --git a/gulpHelpers.js b/gulpHelpers.js
@@ -34,7 +34,6 @@ module.exports = {
   },
 
   jsonifyHTML: function (str) {
-    console.log(arguments);
     return str.replace(/\n/g, '')
       .replace(/<\//g, '<\\/')
       .replace(/\/>/g, '\\/>');

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,10 +11,10 @@ var webpackStream = require('webpack-stream');
 var terser = require('gulp-terser');
 var gulpClean = require('gulp-clean');
 var KarmaServer = require('karma').Server;
-var karmaConfMaker = require('./karma.conf.maker');
-var opens = require('open');
-var webpackConfig = require('./webpack.conf');
-var helpers = require('./gulpHelpers');
+var karmaConfMaker = require('./karma.conf.maker.js');
+var opens = require('opn');
+var webpackConfig = require('./webpack.conf.js');
+var helpers = require('./gulpHelpers.js');
 var concat = require('gulp-concat');
 var header = require('gulp-header');
 var footer = require('gulp-footer');
@@ -71,7 +71,13 @@ function lint(done) {
   const isFixed = function (file) {
     return file.eslint != null && file.eslint.fixed;
   }
-  return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], { base: './' })
+  return gulp.src([
+    'src/**/*.js',
+    'modules/**/*.js',
+    'test/**/*.js',
+    'plugins/**/*.js',
+    './*.js'
+  ], { base: './' })
     .pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true })))
     .pipe(eslint.format('stylish'))
     .pipe(eslint.failAfterError())

diff --git a/integrationExamples/gpt/adloox.html b/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,12 +108,14 @@
                 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();
                 });
 
                 var videoBids = bids[videoAdUnit.code];
                 if (videoBids) {
+// DEMO NOTES: your environment likely will use the commented section ////
                     var videoUrl = videoBids.bids[0].vastUrl;
 //                    var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
 //                        adUnit: videoAdUnit,
@@ -124,17 +128,34 @@
 //                            output: 'vast'
 //                        }
 //                    });
-                    invokeVideoPlayer(videoUrl);
+//////////////////////////////////////////////////////////////////////////
+                    var ret = pbjs.adServers.adloox.buildVideoUrl({
+                        adUnit: videoAdUnit,
+                        url: videoUrl
+                    }, invokeVideoPlayer);
+                    if (!ret) console.log('Error building Adloox video URL');
                 }
             }
 
             // 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
                         },