Merge branch 'main' of github.com:ampproject/amphtml into css_units_desktop

Author: mszylkowski

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/[email protected].1
+  browser-tools: circleci/[email protected].2
   node: circleci/[email protected]
 
 push_and_pr_builds: &push_and_pr_builds

.github/ISSUE_TEMPLATE/release-tracker.yml

@@ -1,6 +1,6 @@
 ---
 name: Release Tracker
-description: Track a new AMP release.
+description: Manually track a new AMP release. (This is automatically updated by the release-tagger GitHub Action).
 labels: 'Type: Release'
 title: "\U0001F684 Release VERSION"
 body:
@@ -17,12 +17,12 @@ body:
     id: promotions
     attributes:
       label: Promotions
-      description: Replace VERSION with AMP version and PROMOTE_TIME with CL submit time.
+      description: Replace `VERSION` with AMP version and `<!-- promote-time -->` with CL submit time.
       value: |
-        - [ ] VERSION promoted to Experimental and Beta (opt-in) channels (PROMOTE_TIME)
-        - [ ] VERSION promoted to Experimental and Beta (1% traffic) channels (PROMOTE_TIME)
-        - [ ] VERSION promoted to Stable channel (PROMOTE_TIME)
-        - [ ] (optional) VERSION promoted to LTS channel (PROMOTE_TIME)
+        - [ ] <!-- amp-version=VERSION channel=beta-opt-in -->VERSION promoted to Experimental and Beta (opt-in) channels <!-- promote-time -->
+        - [ ] <!-- amp-version=VERSION channel=beta-percent -->VERSION promoted to Experimental and Beta (1% traffic) channels <!-- promote-time -->
+        - [ ] <!-- amp-version=VERSION channel=stable -->VERSION promoted to Stable channel <!-- promote-time -->
+        - [ ] <!-- amp-version=VERSION channel=lts -->VERSION promoted to LTS channel <!-- promote-time -->
 
         /cc @ampproject/release-on-duty
     validations:

.github/workflows/cut-nightly.yml

@@ -8,14 +8,17 @@ on:
     - cron: '0 8 * * 2-6'
 
 jobs:
-  sweep-experiments:
+  cut-nightly:
+    environment: release_tagger
     if: github.repository == 'ampproject/amphtml'
     name: Cut Nightly Branch
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 100
 
       - name: Set Up Node
         uses: actions/[email protected]
@@ -28,3 +31,5 @@ jobs:
 
       - name: ⭐ Cut Nightly Branch ⭐
         run: node --unhandled-rejections=strict build-system/release-workflows/cut-nightly.js
+        env:
+          GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}

.github/workflows/release-tagger.yml

@@ -12,7 +12,7 @@ on:
         description: 'base AMP version'
         required: true
       channel:
-        description: 'release channel (beta | stable | lts)'
+        description: 'release channel (beta-opt-in | beta-percent | stable | lts)'
         required: true
 jobs:
   tagger:
@@ -30,6 +30,7 @@ jobs:
             ${{ github.event.inputs.action }} \
             ${{ github.event.inputs.head }} \
             ${{ github.event.inputs.base }} \
-            ${{ github.event.inputs.channel }}
+            ${{ github.event.inputs.channel }} \
+            ${{ github.event.inputs.time }}
         env:
           GITHUB_TOKEN: ${{ secrets.AMPPROJECTBOT }}

3p/vendors/amplified.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2021 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// src/polyfills.js must be the first import.
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {amplified} from '#ads/vendors/amplified';
+
+init(window);
+register('amplified', amplified);
+
+window.draw3p = draw3p;

3p/vendors/broadbandy.js

@@ -0,0 +1,11 @@
+import '#3p/polyfills';
+
+import {register} from '#3p/3p';
+import {draw3p, init} from '#3p/integration-lib';
+
+import {broadbandy} from '#ads/vendors/broadbandy';
+
+init(window);
+register('broadbandy', broadbandy);
+
+window.draw3p = draw3p;

ads/README.md

@@ -346,7 +346,7 @@ If you're adding support for a new third-party ad service, changes to the follow
 -   `/ads/yournetwork.js`: Implement the main logic here. This is the code that's invoked in the third-party iframe once loaded.
 -   `/ads/yournetwork.md`: Documentation detailing yourr ad service for publishers to read.
 -   `/ads/_config.js`: Add service specific configuration here.
--   `/3p/integration.js`: Register your service here.
+-   `/3p/vendors/yournetwork.js`: Register your service here.
 -   `/extensions/amp-ad/amp-ad.md`: Add a link that points to your publisher doc.
 -   `/examples/ads.amp.html`: Add publisher examples here. Since a real ad isn't guaranteed to fill, a consistently displayed fake ad is highly recommended here to help AMP developers confidently identify new bugs.
 

ads/_config.js

@@ -292,7 +292,10 @@ const adConfig = jsonConfiguration({
       'https://v.amoad.com',
     ],
   },
-
+  'amplified': {
+    preconnect: 'https://srv.clickfuse.com',
+    renderStartImplemented: true,
+  },
   'aniview': {
     renderStartImplemented: true,
   },
@@ -349,6 +352,10 @@ const adConfig = jsonConfiguration({
     preconnect: ['https://static.bh-cdn.com', 'https://core-api.bringhub.io'],
   },
 
+  'broadbandy': {
+    renderStartImplemented: true,
+  },
+
   'broadstreetads': {
     prefetch: 'https://cdn.broadstreetads.com/init-2.min.js',
     renderStartImplemented: true,

ads/ads.extern.js

@@ -356,6 +356,10 @@ data.onNoAds;
 // amoad.js
 data.sid;
 
+// amplified.js
+data.amplified_id;
+data.amplified_params;
+
 // appnexus.js
 data.tagid;
 data.member;

ads/google/a4a/utils.js

@@ -99,7 +99,7 @@ const CDN_PROXY_REGEXP =
   /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org((\/.*)|($))+/;
 
 /** @const {string} */
-const TOKEN_VALUE =
+export const TOKEN_VALUE =
   'A560Vqrj/cxoDr3Ldu+cN8qcpkaPx5Yh67pvGScX0kOke10st2EAEQmfQrDKSlVJtF+oZ0WqUYbPLmY6nRQq5wAAAACVeyJvcmlnaW4iOiJodHRwczovL2FtcHByb2plY3Qub3JnOjQ0MyIsImZlYXR1cmUiOiJDb252ZXJzaW9uTWVhc3VyZW1lbnQiLCJleHBpcnkiOjE2MzE2NjM5OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWUsInVzYWdlIjoic3Vic2V0In0=';
 
 /**