Merge branch 'master' into component-intro-tables

* master: (181 commits)
  🏗 Ensure valid flag usage for `gulp` tasks (ampproject#26814)
  build-system: Fix autocomplete error response (ampproject#26824)
  application/json is ab allowed type for <script> (ampproject#26815)
  🚮 Removing amp-consent-v2 experiment logic (ampproject#26162)
  Fix more arrow functions that are passed in as "constructors" (ampproject#26795)
  Variable substitution tester  (ampproject#26695)
  Turn on restrict fullscreen canary (ampproject#26766)
  Mock variableService getMacros  (ampproject#26300)
  Sync from Google (ampproject#26805)
  Sync from Google (ampproject#26803)
  Move video_state macro (ampproject#26212)
  🚀 Move ads variables to amp-analytics (ampproject#25113)
  Sync from Google (ampproject#26800)
  Sync from Google (ampproject#26798)
  Sync from Google (ampproject#26792)
  Another set of example.com change (ampproject#26753)
  Add PWA multidoc loader to examples (ampproject#26680)
  🐛Check for window null before creating tracking pixel (ampproject#26749)
  trying to update Sauce timeouts (ampproject#26737)
  🐛Fixes swipe to dismiss badly ordered swipes on `amp-lightbox-gallery` (ampproject#26788)
  ...

# Conflicts:
#	extensions/amp-accordion/amp-accordion.md
#	extensions/amp-bind/amp-bind.md

.eslintrc

@@ -80,6 +80,7 @@
     "local/is-experiment-on": 2,
     "local/json-configuration": 2,
     "local/no-array-destructuring": 2,
+    "local/no-arrow-on-register-functions": 2,
     "local/no-deep-destructuring": 2,
     "local/no-destructure-assignment-params": 2,
     "local/no-duplicate-import": 2,

.github/ISSUE_TEMPLATE/cherry_pick_template.md

@@ -1,27 +1,31 @@
 ---
-name: Cherry-pick template
+name: Cherry-pick request
 about: Used to request a cherry-pick. See go.amp.dev/cherry-picks
 title: "\U0001F338 Cherry-pick request for #<ISSUE_NUMBER> into #<RELEASE_ISSUE> (Pending)"
-labels: 'Type: Release'
+labels:
+  'Cherry-pick: Beta, Cherry-pick: Experimental, Cherry-pick: LTS, Cherry-pick: Stable, Type:
+  Release'
+assignees: ''
 ---
 
 <!--
 MUST: Replace *everything* in angle brackets in the title AND body of this issue.
+MUST: Update issue labels to indicate which channels the cherry-pick is going into.
 
-If you have any questions see the [cherry-pick documentation](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#cherry-picks).
+If you have any questions see the [cherry-pick documentation](https://github.com/ampproject/amphtml/blob/master/contributing/contributing-code.md#Cherry-picks).
 -->
 
 # Cherry-pick request
 
 <!--
-TIP: Cherry-picks into production most likely require a cherry-pick into RC too. Otherwise, your fix will be lost when the RC is promoted.
+TIP: Cherry-picks into Stable most likely require a cherry-pick into Beta / Experimental too. Otherwise, your fix will be lost when Beta is promoted.
 -->
 
-|       Issue       |       PR       | Production?  |     RC?      | [Release issue](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) |
-| :---------------: | :------------: | :----------: | :----------: | :-----------------------------------------------------------------------------: |
-| #<_ISSUE_NUMBER_> | #<_PR_NUMBER_> | **<YES/NO>** | **<YES/NO>** |                               #<_RELEASE_ISSUE_>                                |
+|       Issue       |       PR       | Beta / Experimental? |   Stable?    |     LTS?     | [Release issue](https://github.com/ampproject/amphtml/labels/Type%3A%20Release) |
+| :---------------: | :------------: | :------------------: | :----------: | :----------: | ------------------------------------------------------------------------------- |
+| #<_ISSUE_NUMBER_> | #<_PR_NUMBER_> |     **<YES/NO>**     | **<YES/NO>** | **<YES/NO>** | #<_RELEASE_ISSUE_>                                                              |
 
-## Why does this issue meet the [cherry-pick criteria](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#cherry-pick-criteria)?
+## Why does this issue meet the [cherry-pick criteria](https://github.com/ampproject/amphtml/blob/master/contributing/contributing-code.md#Cherry-picks)?
 
 <!--
 TIP: Be specific.
@@ -30,15 +34,23 @@ TIP: Be specific.
 <_YOUR_REASONS_>
 
 <!--
-CONDITION: Cherry-picking into production but _not_ RC. Otherwise, delete.
+CONDITION: Cherry-picking into Stable but _not_ Beta / Experimental. Otherwise, delete.
 -->
 
-## Why is a RC cherry-pick not needed?
+## Why is a Beta / Experimental cherry-pick not needed?
 
 <_YOUR_REASONS_>
 
 <!--
-MUST: Filling out the mini-PM template is required _after_ the deployment of a production cherry-pick. If this cherry-pick does not include production, the mini-PM section can be deleted.
+CONDITION: Cherry-picking into LTS. Otherwise, delete.
+-->
+
+## Why is an LTS cherry-pick needed?
+
+<_YOUR_REASONS_>
+
+<!--
+MUST: Filling out the mini-PM template is required _after_ the deployment of a stable cherry-pick. If this cherry-pick does not include stable, the mini-PM section can be deleted.
 
 MUST: This issue cannot be closed until the mini-PM is written and its action items are completed.
 -->

3p/integration.js

@@ -254,6 +254,7 @@ import {swoop} from '../ads/swoop';
 import {taboola} from '../ads/taboola';
 import {tcsemotion} from '../ads/tcsemotion';
 import {teads} from '../ads/teads';
+import {temedya} from '../ads/temedya';
 import {torimochi} from '../ads/torimochi';
 import {tracdelight} from '../ads/tracdelight';
 import {triplelift} from '../ads/triplelift';
@@ -270,6 +271,7 @@ import {viralize} from '../ads/viralize';
 import {vmfive} from '../ads/vmfive';
 import {webediads} from '../ads/webediads';
 import {weboramaDisplay} from '../ads/weborama';
+import {whopainfeed} from '../ads/whopainfeed';
 import {widespace} from '../ads/widespace';
 import {wisteria} from '../ads/wisteria';
 import {wpmedia} from '../ads/wpmedia';
@@ -327,6 +329,8 @@ const AMP_EMBED_ALLOWED = {
   strossle: true,
   svknative: true,
   taboola: true,
+  temedya: true,
+  whopainfeed: true,
   yahoonativeads: true,
   zen: true,
   zergnet: true,
@@ -543,6 +547,7 @@ register('swoop', swoop);
 register('taboola', taboola);
 register('tcsemotion', tcsemotion);
 register('teads', teads);
+register('temedya', temedya);
 register('torimochi', torimochi);
 register('tracdelight', tracdelight);
 register('triplelift', triplelift);
@@ -561,6 +566,7 @@ register('viralize', viralize);
 register('vmfive', vmfive);
 register('webediads', webediads);
 register('weborama-display', weboramaDisplay);
+register('whopainfeed', whopainfeed);
 register('widespace', widespace);
 register('wisteria', wisteria);
 register('wpmedia', wpmedia);

ads/_config.js

@@ -476,7 +476,6 @@ const adConfig = jsonConfiguration({
   },
 
   'forkmedia': {
-    prefetch: 'https://delivery.forkcdn.com/rappio/inread/v1.1/amp/inread.js',
     renderStartImplemented: true,
   },
 
@@ -1049,6 +1048,14 @@ const adConfig = jsonConfiguration({
     consentHandlingOverride: true,
   },
 
+  'temedya': {
+    prefetch: [
+      'https://vidyome-com.cdn.vidyome.com/vidyome/builds/temedya-amp.js',
+      'https://vidyome-com.cdn.vidyome.com/vidyome/builds/widgets.js',
+    ],
+    renderStartImplemented: true,
+  },
+
   'torimochi': {
     renderStartImplemented: true,
   },
@@ -1126,6 +1133,10 @@ const adConfig = jsonConfiguration({
     ],
   },
 
+  'whopainfeed': {
+    prefetch: 'https://widget.infeed.com.ar/widget/widget-amp.js',
+  },
+
   'widespace': {},
 
   'wisteria': {
@@ -1144,7 +1155,7 @@ const adConfig = jsonConfiguration({
   },
 
   'yahoo': {
-    prefetch: 'https://s.yimg.com/os/ampad/display.js',
+    prefetch: 'https://s.yimg.com/aaq/ampad/display.js',
     preconnect: 'https://us.adserver.yahoo.com',
   },
 

ads/forkmedia.js

@@ -14,32 +14,30 @@
  * limitations under the License.
  */
 
-import {loadScript, validateData} from '../3p/3p';
+import {loadScript} from '../3p/3p';
 
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function forkmedia(global, data) {
-  validateData(data, ['product']);
-
   let src = null;
   if (data.product === 'inread') {
     src = 'https://delivery.forkcdn.com/rappio/inread/v1.1/amp/inread.js';
-  }
-
-  if (src) {
-    loadScript(
-      global,
-      src,
-      () => {
-        global.context.renderStart();
-      },
-      () => {
-        global.context.noContentAvailable();
-      }
-    );
+  } else if (data.product === 'vibe') {
+    src = 'https://vibecdn.forkcdn.com/Inarticle/amp/iav.js';
   } else {
-    global.context.noContentAvailable();
+    src = 'https://delivery.forkcdn.com/amp/default.js';
   }
+
+  loadScript(
+    global,
+    src,
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }

ads/google/a4a/shared/test/test-url-builder.js

@@ -19,7 +19,7 @@ import {buildUrl} from '../url-builder';
 describe('buildUrl', () => {
   it('should build a simple URL', () => {
     expect(
-      buildUrl('https://example.com', {'key': 'value'}, Infinity)
-    ).to.equal('https://example.com?key=value');
+      buildUrl('https://example.test', {'key': 'value'}, Infinity)
+    ).to.equal('https://example.test?key=value');
   });
 });

ads/google/a4a/test/test-utils.js

@@ -300,7 +300,7 @@ describe('Google A4A utils', () => {
       expect(
         getAmpRuntimeTypeParameter({
           AMP_CONFIG: {type: 'experimental'},
-          location: {origin: 'https://www.example.com'},
+          location: {origin: 'https://www.example.test'},
         })
       ).to.be.null;
     });