Merge branch 'prebid:master' into master

.github/workflows/ci.yml

@@ -15,15 +15,15 @@ jobs:
     name: run markdownlint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: tj-actions/changed-files@v41
+      - uses: tj-actions/changed-files@v44
         id: changed-files
         with:
           files: '**/*.md'
           separator: ","
-      - uses: DavidAnson/markdownlint-cli2-action@v15
+      - uses: DavidAnson/markdownlint-cli2-action@v16
         if: steps.changed-files.outputs.any_changed == 'true'
         with:
           globs: "${{ steps.changed-files.outputs.all_changed_files }},!_includes"

_data/sidebar.yml

@@ -227,7 +227,7 @@
 
 - sbSecId: 1
   title: Native Ads
-  link: /formats/native.html
+  link: /dev-docs/examples/native-ad-example.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -257,14 +257,6 @@
   sectionTitle:
   subgroup: 1
 
-- sbSecId: 1
-  title: Legacy Browser Example
-  link: /dev-docs/examples/legacy-browser-example.html
-  isHeader: 0
-  isSectionHeader: 0
-  sectionTitle:
-  subgroup: 1
-
 - sbSecId: 1
   title: Using Prebid.js with Microsoft Monetize Ad Server
   link: /dev-docs/examples/use-prebid-with-appnexus-ad-server.html
@@ -1487,16 +1479,16 @@
   subgroup: 3
 
 - sbSecId: 5
-  title: Programmatic Guaranteed
-  link: /prebid-server/features/pg/pbs-pg-idx.html
+  title: Modules
+  link: /prebid-server/pbs-modules/
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
   subgroup: 3
 
 - sbSecId: 5
-  title: Modules
-  link: /prebid-server/pbs-modules/
+  title: Prebid Cache Storage
+  link: /prebid-server/features/pbs-pbc-storage.html
   isHeader: 0
   isSectionHeader: 0
   sectionTitle:
@@ -1722,6 +1714,14 @@
   sectionTitle:
   subgroup: 0
 
+- sbSecId: 6
+  title: Connected TV
+  link: /formats/ctv.html
+  isHeader: 0
+  isSectionHeader: 0
+  sectionTitle:
+  subgroup: 0
+
 - sbSecId: 6
   title: Native
   link: /prebid/native-implementation.html
@@ -1801,7 +1801,7 @@
   subgroup: 1
 
 - sbSecId: 7
-  title: Prebid and MSPA
+  title: Prebid US Compliance
   link: /features/mspa-usnat.html
   isHeader: 0
   isSectionHeader: 0

_includes/astjs.html

@@ -0,0 +1,6 @@
+<!-- markdownlint-disable MD034 -->
+<script async
+    type="text/plain"
+    class="cmplazyload"
+    data-cmp-purpose="c51"
+    data-cmp-src="https://acdn.adnxs.com/ast/ast.js"></script>

_includes/code/web-example.html

@@ -0,0 +1,82 @@
+<!-- markdownlint-disable MD034 -->
+<!-- 
+  provide the following variables:
+  - id: unique id for the example
+  - html: html code snippet
+  - js: js code snippet
+  - scripts: a commad separate list of required scripts. Allowed values are pbjs,gpt,astjs . default is pbjs,ast
+--->
+<ul class="nav nav-tabs" role="tablist">
+    <li class="nav-item ui-tab" role="presentation">
+      <button class="nav-link active" id="{{ include.id }}-result-tab" data-toggle="tab" data-target="#{{ include.id }}-result" type="button" role="tab" aria-controls="result" aria-selected="true">result</button>
+    </li>
+    <li class="nav-item ui-tab" role="presentation">
+      <button class="nav-link" id="{{ include.id }}-html-tab" data-toggle="tab" data-target="#{{ include.id }}-html" type="button" role="tab" aria-controls="html" aria-selected="false">html</button>
+    </li>
+    <li class="nav-item ui-tab" role="presentation">
+      <button class="nav-link" id="{{ include.id }}-js-tab" data-toggle="tab" data-target="#{{ include.id }}-js" type="button" role="tab" aria-controls="js" aria-selected="false">js</button>
+    </li>
+    <li class="nav-item ui-tab" role="presentation">
+      <button class="nav-link" id="{{ include.id }}-source-tab" data-toggle="tab" data-target="#{{ include.id }}-source" type="button" role="tab" aria-controls="js" aria-selected="false">source</button>
+    </li>
+</ul>
+<div class="tab-content mb-3" id="example-tab-content">
+  <div class="tab-pane fade show active" id="{{ include.id }}-result" role="tabpanel" aria-labelledby="{{ include.id }}-result-tab">
+    <div class="bg-light p-3 shadow-sm">
+      <!-- external required scripts -->
+      {% assign scripts = include.scripts | split: "," %}
+      {% for script in scripts %}
+        {% if script == "pbjs" %}
+          {% include prebidjs-non-prod.html %}
+        {% elsif script == "gpt" %}
+          {% include gptjs.html %}
+        {% elsif script == "astjs" %}
+          {% include astjs.html %}
+        {% else %}
+          script tag '{{ script }}' unknown
+        {% endif %}
+      {% else %}
+        <!-- no required scripts defined, pbjs will be included by default -->
+        {% include prebidjs-non-prod.html %}
+        {% include gptjs.html %}
+      {% endfor %}
+
+      <!-- example code -->
+      <script>{{ include.js }}</script>
+      <!-- example html -->
+      {{ include.html }}
+    </div>
+  </div>
+  <div class="tab-pane fade" id="{{ include.id }}-html" role="tabpanel" aria-labelledby="{{ include.id }}-html-tab">
+    <pre class="mt-0 shadow-sm"><code class="language-html">{{ include.html | xml_escape}}</code></pre>
+  </div>
+  <div class="tab-pane fade" id="{{ include.id }}-js" role="tabpanel" aria-labelledby="{{ include.id }}-js-tab">
+    <pre class="mt-0 shadow-sm"><code class="language-javascript">{{ include.js }}</code></pre>
+  </div>
+  <div class="tab-pane fade" id="{{ include.id }}-source" role="tabpanel" aria-labelledby="{{ include.id }}-source-tab">
+    <pre class="mt-0 shadow-sm"><code class="language-html">&lt;html&gt;
+  &lt;head&gt;
+    &lt;meta charset=&quot;UTF-8&quot;&gt;
+    &lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1.0&quot;&gt;
+    &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;ie=edge&quot;&gt;
+    &lt;title&gt;{{ page.title }}&lt;/title&gt;
+
+    &lt;!-- required scripts --&gt;
+    {% assign scripts = include.scripts | split: "," %}{% for script in scripts %}{% if script == "pbjs" %}&lt;script async src=&quot;https://cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js&quot;&gt;&lt;/script&gt;
+    {% elsif script == "gpt" %}&lt;script async src=&quot;https://securepubads.g.doubleclick.net/tag/js/gpt.js&quot;&gt;&lt;/script&gt;
+    {% elsif script == "astjs" %}&lt;script async src=&quot;https://acdn.adnxs.com/ast/ast.js&quot;&gt;&lt;/script&gt;{% else %}&lt;!-- unknown script tag '{{ script }}' required --&gt;{% endif %}{% else %}&lt;script async src=&quot;//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js&quot;&gt;&lt;/script&gt;
+    &lt;script async src=&quot;https://securepubads.g.doubleclick.net/tag/js/gpt.js&quot;&gt;&lt;/script&gt;{% endfor %}
+  &lt;/head&gt;
+  &lt;body&gt;
+
+  &lt;!-- javascript --&gt;
+  &lt;script&gt;{{ include.js }}&lt;/script&gt;
+
+  &lt;!-- html --&gt;
+  {{ include.html | xml_escape}}
+  &lt;/body&gt;
+&lt;/html&gt;
+    </code></pre>
+  </div>
+</div>
+

_includes/prebidjs-non-prod.html

@@ -1,2 +1,3 @@
+<!-- markdownlint-disable MD034 -->
 <!-- non-production version of prebid.js-->
-<script type="text/plain" class="cmplazyload" data-cmp-vendor="s1442" async src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>
+<script type="text/plain" class="cmplazyload" data-cmp-vendor="s1442" async data-cmp-src="https//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js"></script>

_layouts/example.html

@@ -51,27 +51,10 @@ <h4>About this example:</h4>
           </div>
         </div>
 
-    <p></p>
-        <p>
-          In the JSFiddle example below:
-        <ul><li>Click <b>Result</b> to see the example output.</li>
-            <li>Click <b>Edit in JSFiddle</b> to open the example in the JSFiddle editor in a new tab.</li></ul>
-        </p>
-
-
         <div class="row">
-          <!-- JSFiddle -->
-          <iframe width="100%" height="{{page.code_height}}" src="about:blank"
-                  allowfullscreen="allowfullscreen" allowpaymentrequest
-                  frameborder="0"noresize="noresize" scrolling="no" frameborder="0" marginheight="0" marginwidth="0" 
-                  class="cmplazyload" 
-                  data-cmp-purpose="1"
-                  data-cmp-src="//{{page.jsfiddle_link}}"
-                  data-cmp-preview-headline="JSFiddle"
-                  data-cmp-preview-text="Sorry, JSFiddle code examples aren't available with your cookie privacy settings."
-                  data-cmp-preview-checkbox=""
-                  ALLOWTRANSPARENCY="true">
-          </iframe>
+          <div class="col-md-12">
+            {{ content }}
+          </div>
         </div>
 
         <div class="row">

_layouts/home.html

@@ -71,6 +71,12 @@ <h2>Formats</h2>
           <div class="card-media">{% include icon__format--video.svg %}</div>
         </div>
       </div>
+      <div class="card text-center">
+        <div class="card-body">
+          <a class="card-title stretched-link" href="/formats/ctv.html">Connected TV</a>
+          <div class="card-media card-media-ctv">{% include icon__format--ctv.svg %}</div>
+        </div>
+      </div>
       <div class="card text-center">
         <div class="card-body">
           <a class="card-title stretched-link" href="/formats/amp.html">AMP</a>

_sass/components/_card.scss

@@ -88,6 +88,13 @@
           }
         }
       }
+
+      /** this is required for the CTV icon the path segment is not painted, but filled */
+      + .card-media-ctv {
+        path {
+          fill: $t-text-color--reverse;
+        }
+      }
     }
 
     + .card-media {

assets/js/download.js

@@ -8,7 +8,7 @@
         // show all adapters
         $(".adapters .col-md-4").show();
         setPrepickedModules();
-        
+
         document.getElementById('download-button').addEventListener('click', function (event) {
             event.preventDefault();
             submit_download();
@@ -112,6 +112,23 @@
         });
     }
 
+    const renameModules = (function() {
+        const RENAMES = [
+            [
+                /^8\./,
+                {
+                    tcfControl: 'gdprEnforcement',
+                    consentManagementTcf: 'consentManagement',
+                    paapiForGpt: 'fledgeForGpt'
+                }
+            ]
+        ];
+        return function(version, modules) {
+            const renames = RENAMES.find(([pat]) => pat.test(version))?.[1] || {};
+            return modules.map(mod => renames.hasOwnProperty(mod) ? renames[mod] : mod)
+        }
+    })();
+
     function get_form_data() {
         var modules = [];
         var version = $(".selectpicker").val();
@@ -138,7 +155,7 @@
             });
 
         return {
-            modules,
+            modules: renameModules(version, modules),
             version,
             removedModules,
         };