Merge branch 'ampproject:main' into fix/amp-consent-iframe-title

ampproject · Sep 9, 2024 · b395972 · b395972
2 parents 53fa8ba + f370d15
commit b395972
Show file tree

Hide file tree

Showing 110 changed files with 17,327 additions and 9,165 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,8 +3,8 @@ version: 2.1
 orbs:
   browser-tools: circleci/[email protected]
   codecov: codecov/[email protected]
-  macos: circleci/[email protected].1
-  node: circleci/node@5.2.0
+  macos: circleci/[email protected].2
+  node: circleci/node@6.1.0
 
 push_and_pr_builds: &push_and_pr_builds
   filters:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,21 +29,21 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           config-file: ./.github/codeql/config.yml
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/cross-platform-builds.yml b/.github/workflows/cross-platform-builds.yml
@@ -19,14 +19,14 @@ jobs:
     runs-on: ${{ matrix.platform }}-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: Checkout Repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Set Up Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: lts/*
       - name: Install Dependencies
@@ -44,11 +44,11 @@ jobs:
     environment: create_issue_on_error
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Create issue on error
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2

diff --git a/.github/workflows/cut-nightly.yml b/.github/workflows/cut-nightly.yml
@@ -20,17 +20,17 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: Checkout Repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 100
 
       - name: Set Up Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: lts/*
 
@@ -55,11 +55,11 @@ jobs:
     environment: create_issue_on_error
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Create issue on error
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2
+        uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
diff --git a/.github/workflows/release-tagger.yml b/.github/workflows/release-tagger.yml
@@ -26,14 +26,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: lts/*
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - run: bash ./.github/workflows/install_dependencies.sh
       - name: Run tagger
         run: |
@@ -56,11 +56,11 @@ jobs:
     environment: create_issue_on_error
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Create issue on error
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -32,17 +32,17 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: 'Checkout code'
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
       - name: 'Run analysis'
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -64,14 +64,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: 'Upload artifact'
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/status-page.yml b/.github/workflows/status-page.yml
@@ -14,14 +14,14 @@ jobs:
     environment: status_page
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: lts/*
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Add progress comment to cherry-pick issue for Stable and LTS
         if: github.event_name == 'issues' && github.event.action == 'opened'
         run: |
@@ -52,11 +52,11 @@ jobs:
     environment: create_issue_on_error
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Create issue on error
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2

diff --git a/.github/workflows/update-session-issues.yml b/.github/workflows/update-session-issues.yml
@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: Checkout Repo
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Update Session Issues
         run: |
           node ./build-system/common/update-session-issues

diff --git a/3p/integration-lib.js b/3p/integration-lib.js
@@ -48,7 +48,6 @@ const AMP_EMBED_ALLOWED = {
   myua: true,
   mywidget: true,
   nativery: true,
-  lentainform: true,
   opinary: true,
   outbrain: true,
   plista: true,

diff --git a/3p/integration.js b/3p/integration.js
@@ -83,6 +83,7 @@ import {aja} from '#ads/vendors/aja';
 import {amoad} from '#ads/vendors/amoad';
 import {aniview} from '#ads/vendors/aniview';
 import {anyclip} from '#ads/vendors/anyclip';
+import {appmonsta} from '#ads/vendors/appmonsta';
 import {appnexus} from '#ads/vendors/appnexus';
 import {appvador} from '#ads/vendors/appvador';
 import {atomx} from '#ads/vendors/atomx';
@@ -158,7 +159,6 @@ import {ketshwa} from '#ads/vendors/ketshwa';
 import {kiosked} from '#ads/vendors/kiosked';
 import {kixer} from '#ads/vendors/kixer';
 import {kuadio} from '#ads/vendors/kuadio';
-import {lentainform} from '#ads/vendors/lentainform';
 import {ligatus} from '#ads/vendors/ligatus';
 import {lockerdome} from '#ads/vendors/lockerdome';
 import {logly} from '#ads/vendors/logly';
@@ -287,7 +287,6 @@ import {wisteria} from '#ads/vendors/wisteria';
 import {wpmedia} from '#ads/vendors/wpmedia';
 import {wunderkind} from '#ads/vendors/wunderkind';
 import {xlift} from '#ads/vendors/xlift';
-import {yahoo} from '#ads/vendors/yahoo';
 import {yahoofedads} from '#ads/vendors/yahoofedads';
 import {yahoojp} from '#ads/vendors/yahoojp';
 import {yahoonativeads} from '#ads/vendors/yahoonativeads';
@@ -368,6 +367,7 @@ register('aja', aja);
 register('amoad', amoad);
 register('aniview', aniview);
 register('anyclip', anyclip);
+register('appmonsta', appmonsta);
 register('appnexus', appnexus);
 register('appvador', appvador);
 register('atomx', atomx);
@@ -448,7 +448,6 @@ register('ketshwa', ketshwa);
 register('kiosked', kiosked);
 register('kixer', kixer);
 register('kuadio', kuadio);
-register('lentainform', lentainform);
 register('ligatus', ligatus);
 register('lockerdome', lockerdome);
 register('logly', logly);
@@ -583,7 +582,6 @@ register('wisteria', wisteria);
 register('wunderkind', wunderkind);
 register('wpmedia', wpmedia);
 register('xlift', xlift);
-register('yahoo', yahoo);
 register('yahoofedads', yahoofedads);
 register('yahoojp', yahoojp);
 register('yahoonativeads', yahoonativeads);

diff --git a/3p/vendors/lentainform.js → 3p/vendors/appmonsta.js b/3p/vendors/lentainform.js → 3p/vendors/appmonsta.js
@@ -4,9 +4,9 @@ import '#3p/polyfills';
 import {register} from '#3p/3p';
 import {draw3p, init} from '#3p/integration-lib';
 
-import {lentainform} from '#ads/vendors/lentainform';
+import {appmonsta} from '#ads/vendors/appmonsta';
 
 init(window);
-register('lentainform', lentainform);
+register('appmonsta', appmonsta);
 
 window.draw3p = draw3p;
diff --git a/3p/vendors/yahoo.js → 3p/vendors/piberica.js b/3p/vendors/yahoo.js → 3p/vendors/piberica.js
@@ -4,9 +4,9 @@ import '#3p/polyfills';
 import {register} from '#3p/3p';
 import {draw3p, init} from '#3p/integration-lib';
 
-import {yahoo} from '#ads/vendors/yahoo';
+import {piberica} from '#ads/vendors/piberica';
 
 init(window);
-register('yahoo', yahoo);
+register('piberica', piberica);
 
 window.draw3p = draw3p;
diff --git a/ads/_a4a-config.js b/ads/_a4a-config.js
@@ -27,7 +27,9 @@ export function getA4ARegistry() {
       'dianomi': () => true,
       'doubleclick': () => true,
       'fake': () => true,
-      'mgid': (win, adTag) => !adTag.hasAttribute('data-container'),
+      'mgid': (win, adTag) =>
+        !adTag.hasAttribute('data-container') &&
+        !adTag.hasAttribute('data-website'),
       'nws': () => true,
       'smartadserver': () => true,
       'valueimpression': () => true,

diff --git a/ads/_config.js b/ads/_config.js
@@ -350,6 +350,10 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
+  'appmonsta': {
+    preconnect: 'https://ssp.appmonsta.ai',
+  },
+
   'appnexus': {
     prefetch: 'https://acdn.adnxs.com/ast/ast.js',
     preconnect: 'https://ib.adnxs.com',
@@ -743,15 +747,6 @@ const adConfig = jsonConfiguration({
 
   'kuadio': {},
 
-  'lentainform': {
-    renderStartImplemented: true,
-    preconnect: [
-      'https://jsc.lentainform.com',
-      'https://servicer.lentainform.com',
-      'https://s-img.lentainform.com',
-    ],
-  },
-
   'ligatus': {
     prefetch: 'https://ssl.ligatus.com/render/ligrend.js',
     renderStartImplemented: true,
@@ -1001,6 +996,11 @@ const adConfig = jsonConfiguration({
     consentHandlingOverride: true,
   },
 
+  'piberica': {
+    preconnect: ['https://trafico.prensaiberica.es'],
+    renderStartImplemented: true,
+  },
+
   'pixad': {},
 
   'pixels': {
@@ -1492,11 +1492,6 @@ const adConfig = jsonConfiguration({
     renderStartImplemented: true,
   },
 
-  'yahoo': {
-    prefetch: 'https://s.yimg.com/aaq/ampad/display.js',
-    preconnect: 'https://us.adserver.yahoo.com',
-  },
-
   'yahoofedads': {
     renderStartImplemented: true,
   },

diff --git a/ads/ads.extern.js b/ads/ads.extern.js
@@ -596,6 +596,12 @@ data.dfpSlot;
 data.nc;
 data.auid;
 
+// piberica.js
+data.height;
+data.publisher;
+data.slot;
+data.width;
+
 // pixels.js
 var pixelsAd;
 var pixelsAMPAd;