Merge branch 'master' of github.com:ampproject/amphtml into add/amp-i…

…frame-pymjs-support

* 'master' of github.com:ampproject/amphtml: (436 commits)
  🐛Add computed styles to fake win (ampproject#26514)
  📦 Update dependency eslint-config-prettier to v6.10.0 (ampproject#26518)
  🐛 Rewrite relative urls in the bookend (ampproject#26490)
  ✨ [amp-list] Introduce "amp-state:" as a usable protocol for the src attribute. (ampproject#26284)
  Add terminal newline to files.txt (ampproject#26513)
  📦 Update dependency chromedriver to v79.0.2 (ampproject#26515)
  ♻️ Change the opt-in cookie values to reflect upcoming CDN changes (ampproject#26489)
  ♻️<amp-next-page> v2 minor renaming and fixes (ampproject#26468)
  fix link (ampproject#26508)
  amp-list: fix broken test re. missing layout (ampproject#26509)
  performance: emit timeOrigin w/ polyfill (ampproject#26485)
  Position n+1 story desktop page before positioning attributes are set. (ampproject#26488)
  ✨amp-nested-menu: allow svg into (ampproject#26502)
  Log user warning when missing URL arg for shadow doc (ampproject#26290)
  📦 Update dependency puppeteer to v2.1.0 (ampproject#26501)
  Ensure that fluid slots hidden by media queries do not issue ad requests. (ampproject#26352)
  📦 Update dependency mocha to v7.0.1 (ampproject#26495)
  📦 Update dependency fetch-mock to v8.3.2 (ampproject#26491)
  Revert 'Move mutator implementations out to a standalone service' (ampproject#26479)
  Fix syntax error (ampproject#26481)
  ...

.eslintignore

@@ -9,12 +9,12 @@ out/**
 test/coverage/**
 
 # Code directories
-**/*.extern.js
 build-system/tasks/visual-diff/snippets/*.js
 build-system/babel-plugins/**/fixtures/**/*.js
 build-system/server/app-index/test/*.js
 examples/**
 extensions/amp-a4a/0.1/test/testdata/**
+src/purifier/noop.js
 testing/local-amp-chrome-extension/**
 third_party/**
 validator/**

.eslintrc

@@ -81,6 +81,7 @@
     "local/json-configuration": 2,
     "local/no-array-destructuring": 2,
     "local/no-deep-destructuring": 2,
+    "local/no-destructure-assignment-params": 2,
     "local/no-duplicate-import": 2,
     "local/no-duplicate-name-typedef": 2,
     "local/no-es2015-number-props": 2,
@@ -92,16 +93,19 @@
     "local/no-import-rename": 2,
     "local/no-is-amp-alt": 2,
     "local/no-log-array": 2,
+    "local/no-mixed-interpolation": 2,
     "local/no-mixed-operators": 2,
     "local/no-module-exports": 2,
-    "local/no-mixed-interpolation": 2,
+    "local/no-rest": 2,
     "local/no-spread": 2,
     "local/no-style-display": 2,
     "local/no-style-property-setting": 2,
     "local/no-swallow-return-from-allow-console-error": 2,
     "local/no-unload-listener": 2,
     "local/prefer-deferred-promise": 0,
     "local/prefer-destructuring": 2,
+    "local/prefer-spread-props": 2,
+    "local/prefer-unnested-spread-objects": 2,
     "local/private-prop-names": 2,
     "local/query-selector": 2,
     "local/split-single-pass-comment": 2,
@@ -191,6 +195,7 @@
       ],
       "rules": {
         "require-jsdoc": 0,
+        "local/no-destructure-assignment-params": 0,
         "jsdoc/check-param-names": 0,
         "jsdoc/check-tag-names": 0,
         "jsdoc/check-types": 0,
@@ -225,6 +230,20 @@
         "process": false,
         "require": false
       }
+    },
+    {
+      "files": ["**/*.extern.js"],
+      "rules": {
+        "no-var": 0,
+        "no-undef": 0,
+        "no-unused-vars": 0,
+        "prefer-const": 0,
+        "require-jsdoc": 0,
+        "jsdoc/check-tag-names": 0,
+        "local/closure-type-primitives": 0,
+        "local/no-duplicate-name-typedef": 0,
+        "google-camelcase/google-camelcase": 0
+      }
     }
   ]
 }

.github/ISSUE_TEMPLATE/cherry_pick_template.md

@@ -1,6 +1,6 @@
 ---
 name: Cherry-pick template
-about: Used to request a cherry-pick. See bit.ly/amp-cherry-pick
+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'
 ---

.github/ISSUE_TEMPLATE/release-tracking-issue.md

@@ -13,8 +13,8 @@ assignees: ''
 <!--
 Note to onduty:
 
-Use this issue to track a release from the initial canary release build through
-production. The community uses this issue to keep track of what is going on
+Use this issue to track a release from the initial experimental/beta release build through
+promotion to stable and LTS. The community uses this issue to keep track of what is going on
 with the release so please keep this issue up to date:
 
 - As you reach each stage of the release, check the appropriate checkbox and replace <CL submit time> with the "Submitted" text from the corresponding CL, e.g. "2:49 PM, Jul 25, 2018 UTC-4".
@@ -23,25 +23,34 @@ with the release so please keep this issue up to date:
   release number to the GitHub tag page the first time a given release number
   appears in the checkboxes.
 - Add any updates that may be of interest to the community (such as delays) as
-  comments on this issue, including after the release is pushed to production.
+  comments on this issue, including after the release is promoted to Stable (and, in some cases, LTS).
 - Keep the title of the issue updated to reflect whether this issue is tracking
-  the Canary or the build in Production.
+  the Experimental/Beta builds or the build in Stable.
 
 Note: remove the backticks (``) from the link.
 -->
 
 - [x] Release `[<RELEASE_NUMBER>](https://github.com/ampproject/amphtml/releases/tag/<RELEASE_NUMBER>)` is cut as a new canary release
-- [ ] Release <RELEASE_NUMBER> pushed to dev channel (<CL submit time>)
-- [ ] Release <RELEASE_NUMBER> pushed to 1% (<CL submit time>)
-- [ ] Release <RELEASE_NUMBER> pushed to production (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to Experimental and Beta (opt-in) channels (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to Experimental and Beta (1% traffic) channels (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to Stable channel (<CL submit time>)
 
 <!--
+On the second Monday of each month, the current stable version will be promoted to the LTS release channel. In other words: 
+
+- If this release is promoted to stable on the first Tuesday of a given month, it needs to be promoted to LTS on the second Monday of the same month.
+- If this release is promoted to stable on the second, third, fourth, or fifth Monday of a given month, it is not an LTS release candidate (but will be included in a later LTS release).
+
+Based on the above, if this release must be promoted to LTS, copy-paste the following checkbox into the list above.
+
+- [ ] Release <RELEASE_NUMBER> promoted to LTS (<CL submit time>)
+
 If you perform cherry picks, add/update the checkboxes above as needed e.g.
 
-- [ ] Release `[<CHERRY_PICK_RELEASE_NUMBER>](...)` created with cherry picks.
-- [ ] Release <CHERRY_PICK_RELEASE_NUMBER> pushed to Dev Channel
+- [ ] Release `[<CHERRY_PICK_RELEASE_NUMBER>](...)` created with cherry picks
+- [ ] Release <CHERRY_PICK_RELEASE_NUMBER> promoted to Experimental and Beta channels
 -->
 
-See the [release documentation](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md) for more information on the release process, including how to test changes in the Dev Channel.
+See the [release documentation](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md) for more information on the release process, including how to test changes in the Experimental channel.
 
-If you find a bug in this build, please file an [issue](https://github.com/ampproject/amphtml/issues/new). If you believe the bug should be fixed in this build, follow the instructions in the [cherry picks documentation](https://bit.ly/amp-cherry-pick).
+If you find a bug in this build, please file an [issue](https://github.com/ampproject/amphtml/issues/new). If you believe the bug should be fixed in this build, follow the instructions in the [cherry picks documentation](https://go.amp.dev/cherry-picks).

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,8 @@
   - Mention the GitHub issue that is being addressed by the pull request.
   - The keywords `Fixes`, `Closes`, or `Resolves` followed the issue number will automatically close the issue.
 
+> NOTE: All non-trivial changes (like introducing new features or components) should have an associated issue or reference an I2I (intent-to-implement: go.amp.dev/i2i). Please read through the contribution process (go.amp.dev/contributing/code) for more information.
+
 # Example of a good description:
 
 - Implement aspect X

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 .g4ignore
-build
+build/
 .amp-build
 c
 /dist
@@ -30,4 +30,6 @@ firebase
 .firebaserc
 firebase.json
 .firebase/
-extensions/amp-analytics/0.1/vendors/*.json
+src/purifier/dist
+build-system/tasks/performance/cache
+build-system/tasks/performance/results.json

.renovaterc.json

@@ -12,6 +12,7 @@
     "package.json",
     "build-system/tasks/e2e/package.json",
     "build-system/tasks/visual-diff/package.json",
+    "src/purifier/package.json",
     "validator/package.json"
   ]
 }

.travis.yml

@@ -93,17 +93,20 @@ jobs:
       name: 'Experiment A Tests'
       script:
         - unbuffer node build-system/pr-check/experiment-tests.js --experiment=experimentA
+      cache: false
     - stage: experiment
       name: 'Experiment B Tests'
       script:
         - unbuffer node build-system/pr-check/experiment-tests.js --experiment=experimentB
+      cache: false
     - stage: experiment
       name: 'Experiment C Tests'
       script:
         - unbuffer node build-system/pr-check/experiment-tests.js --experiment=experimentC
+      cache: false
 before_cache:
-  # do not store cache for pr builds
-  - if [[ $TRAVIS_EVENT_TYPE == pull_request ]]; then exit $TRAVIS_TEST_RESULT ; fi
+  # do not store cache for pr builds or experiment stage builds
+  - if [[ $TRAVIS_EVENT_TYPE == pull_request ]] || [[ $TRAVIS_BUILD_STAGE_NAME == experiment ]]; then exit $TRAVIS_TEST_RESULT ; fi
 cache:
   directories:
     - node_modules

.vscode/settings.json

@@ -9,6 +9,8 @@
     ".eslintrc": "json",
     ".prettierrc": "json",
     ".renovaterc.json": "json",
+
+    // Enable YAML auto-formatting for these files.
     ".codecov.yml": "yaml",
     ".lando.yml": "yaml",
     ".lgtm.yml": "yaml",
@@ -17,7 +19,7 @@
 
   // Auto-fix JS files with ESLint using amphtml's custom settings. Needs
   // https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint
-  "eslint.autoFixOnSave": true,
+  "editor.codeActionsOnSave": {"source.fixAll.eslint": true},
   "[js]": {"editor.formatOnSave": false},
 
   // Auto-fix non-JS files with Prettier using amphtml's custom settings. Needs

3p/3p.js

@@ -232,7 +232,8 @@ export function validateData(data, mandatoryFields, opt_optionalFields) {
       allowedFields = allowedFields.concat(field);
     } else {
       userAssert(
-        data[field],
+        // Allow zero values for height, width etc.
+        data[field] != null,
         'Missing attribute for %s: %s.',
         data.type,
         field

3p/OWNERS

@@ -4,7 +4,10 @@
 {
   rules: [
     {
-      owners: [{name: 'ampproject/wg-ads'}],
+      owners: [
+        {name: 'ampproject/wg-ads'},
+        {name: 'ampproject/wg-ui-and-a11y'},
+      ],
     },
   ],
 }

3p/README.md

@@ -66,5 +66,5 @@ Review the [ads/README](../ads/README.md) for further details on ad integration.
 You should ensure there are integration tests for your extension. These should be added to the AMP
 repo where it makes sense. In some cases this won't be possible because it relies on bringing up
 third-party infrastructure. In these cases you should maintain testing for the extension on your
-infrastructure against both production AMP and [canary](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#amp-dev-channel).
+infrastructure against both production AMP and [canary](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#amp-experimental-and-beta-channels).
 Upon any monitored failures, an escalation can be raised in [regular AMP communication channel](https://github.com/ampproject/amphtml/blob/master/CONTRIBUTING.md#discussion-channels).

3p/beopinion.js

@@ -88,6 +88,9 @@ function createContainer(global, data) {
 function getBeOpinionAsyncInit(global, accountId) {
   const {context} = global;
   return function() {
+    context.onResizeDenied(function(requestedHeight, requestedWidth) {
+      context.requestResize(requestedWidth, requestedHeight);
+    });
     global.BeOpinionSDK.init({
       account: accountId,
       onContentReceive: function(hasContent) {
@@ -100,7 +103,6 @@ function getBeOpinionAsyncInit(global, accountId) {
       onHeightChange: function(newHeight) {
         const c = global.document.getElementById('c');
         const boundingClientRect = c./*REVIEW*/ getBoundingClientRect();
-        context.onResizeDenied(context.requestResize.bind(context));
         context.requestResize(boundingClientRect.width, newHeight);
       },
     });

3p/iframe-transport-client.js

@@ -182,7 +182,7 @@ export class IframeTransportContext {
     this.iframeMessagingClient_./*OK*/ sendMessage(
       MessageType.IFRAME_TRANSPORT_RESPONSE,
       /** @type {!JsonObject} */
-      (Object.assign({message: data}, this.baseMessage_))
+      ({message: data, ...this.baseMessage_})
     );
   }
 }