Merge branch 'prebid:master' into master

prebid · Jan 31, 2022 · 11c2e65 · 11c2e65
2 parents 1ac92f9 + 69bf5c5
commit 11c2e65
Show file tree

Hide file tree

Showing 195 changed files with 38,713 additions and 5,483 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,10 +23,13 @@ module.exports = {
     'BROWSERSTACK_USERNAME': false,
     'BROWSERSTACK_KEY': false
   },
+  // use babel as parser for fancy syntax
+  parser: '@babel/eslint-parser',
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 2018,
   },
+
   rules: {
     'comma-dangle': 'off',
     semi: 'off',
@@ -49,5 +52,9 @@ module.exports = {
     rules: {
       'prebid/validate-imports': ['error', allowedModules[key]]
     }
-  }))
+  })).concat([{
+    // code in other packages (such as plugins/eslint) is not "seen" by babel and its parser will complain.
+    files: 'plugins/*/**/*.js',
+    parser: 'esprima'
+  }])
 };
diff --git a/allowedModules.js b/allowedModules.js
@@ -1,12 +1,9 @@
 
 const sharedWhiteList = [
-  'core-js-pure/features/array/find', // no ie11
-  'core-js-pure/features/array/includes', // no ie11
-  '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/web/url-search-params' // no ie11
+  'prebidjs-polyfill/arrayFrom',
+  'prebidjs-polyfill/find',
+  'prebidjs-polyfill/findIndex',
+  'prebidjs-polyfill/includes',
 ];
 
 module.exports = {

diff --git a/...Examples/gpt/haloRtdProvider_example.html → ...amples/gpt/hadronRtdProvider_example.html b/...Examples/gpt/haloRtdProvider_example.html → ...amples/gpt/hadronRtdProvider_example.html
@@ -1,8 +1,8 @@
 <html>
 <head>
     <script>
-      var testHaloId = "030tstezbb07jv2yg08xizqr0bwpa0c0evvmq00eivtcg0nc9v970ntek210qskvk40trr7270wqxik90zq3u2d12pa5j3137rx2918nmsj905vat8b1elzfjf1hl5r1i1kkc2jl";
-      window.localStorage.setItem('auHaloId', testHaloId);
+      var testHadronId = "030tstezbb07jv2yg08xizqr0bwpa0c0evvmq00eivtcg0nc9v970ntek210qskvk40trr7270wqxik90zq3u2d12pa5j3137rx2918nmsj905vat8b1elzfjf1hl5r1i1kkc2jl";
+      window.localStorage.setItem('auHadronId', testHadronId);
     </script>
 
     <script>
@@ -47,7 +47,7 @@
                     auctionDelay: testAuctionDelay, // lower in real scenario to meet publisher spec
                     dataProviders: [
                         {
-                            name: "halo",
+                            name: "hadron",
                             waitForIt: true,
                             params: {
                                 segmentCache: false,
@@ -65,8 +65,8 @@
         });
 
         function sendAdserverRequest() {
-            document.getElementById('audigent_segments').innerHTML = window.localStorage.getItem('auHaloRtd');
-            document.getElementById('halo_id').innerHTML = testHaloId;
+            document.getElementById('audigent_segments').innerHTML = window.localStorage.getItem('auHadronRtd');
+            document.getElementById('hadron_id').innerHTML = testHadronId;
 
             if (pbjs.adserverRequestSent) return;
             pbjs.adserverRequestSent = true;
@@ -106,19 +106,19 @@
 </head>
 
 <body>
-<h2>Halo RTD Prebid</h2>
+<h2>Hadron RTD Prebid</h2>
 
 <div id='test-div'>
     <script>
         googletag.cmd.push(function() { googletag.display('test-div'); });
     </script>
 </div>
 
-Halo Id:
-<div id='halo_id'>
+Hadron Id:
+<div id='hadron_id'>
 </div>
 
-Halo Real-Time Data:
+Hadron Real-Time Data:
 <div id='audigent_segments'>
 </div>
 </body>

diff --git a/integrationExamples/gpt/idImportLibrary_example.html b/integrationExamples/gpt/idImportLibrary_example.html
@@ -69,10 +69,10 @@
                 name: "zeotapIdPlus"
               },
               {
-                name: 'haloId',
+                name: 'hadronId',
                 storage: {
                   type: "html5",
-                  name: "haloId",
+                  name: "hadronId",
                   expires: 28
                 }
               }, {

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
@@ -215,10 +215,10 @@
               "name": "zeotapIdPlus"
             },
             {
-              "name": "haloId",
+              "name": "hadronId",
               "storage": {
                 "type": "cookie",
-                "name": "haloId",
+                "name": "hadronId",
                 "expires": 28
               }
             },