Merge branch 'master' into amp-next-page-v2-infinite-loading

.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

@@ -49,4 +49,4 @@ If you perform cherry picks, add/update the checkboxes above as needed e.g.
 
 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.
 
-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/ISSUE_TEMPLATE/release_issue_template.md

@@ -34,4 +34,4 @@ If you perform cherry picks, add/update the checkboxes above as needed e.g.
 
 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.
 
-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).

.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"
  ]
 }

ads/readmo.js

@@ -29,7 +29,7 @@ export function readmo(global, data) {
 
  const {section, module, sponsoredByLabel, infinite, title, url} = data;
 
- window.publisherUrl = url;
+ global.publisherUrl = url;
 
  (global.readmo = global.readmo || []).push({
  section,
@@ -41,21 +41,6 @@ export function readmo(global, data) {
  amp: true,
  });
 
- global.context.observeIntersection(
- entries => {
- entries.forEach(entry => {
- if (global.Readmo) {
- global.Readmo.onViewChange({
- intersectionRatio: entry.intersectionRatio,
- });
- }
- });
- },
- {
- threshold: [0, 0.5, 1],
- }
- );
-
  loadScript(global, 'https://s.yimg.com/dy/ads/readmo.js', () =>
  global.context.renderStart()
  );

ads/readmo.md

@@ -28,7 +28,7 @@ ReadMo only requires a section code to run. Please work your account manager to
  height="400"
  type="readmo"
  layout="responsive"
- data-url="https://yoursite.com"
+ data-url="https://yourdomain.com"
  data-infinite="true"
  data-section="1234567"
 >

build-system/compile/bundles.config.js

@@ -489,7 +489,7 @@ exports.extensionBundles = [
  },
  {
  name: 'amp-date-display',
- version: '0.1',
+ version: ['0.1', '0.2'],
  latestVersion: '0.1',
  type: TYPES.MISC,
  },
@@ -753,7 +753,7 @@ exports.extensionBundles = [
  },
  {
  name: 'amp-next-page',
- version: ['0.1', '0.2'],
+ version: ['0.1', '1.0'],
  latestVersion: '0.1',
  options: {hasCss: true},
  type: TYPES.MISC,

build-system/compile/check-for-unknown-deps.js

@@ -17,7 +17,7 @@
 
 const log = require('fancy-log');
 const through = require('through2');
-const {red, cyan} = require('ansi-colors');
+const {red, cyan, yellow} = require('ansi-colors');
 
 /**
  * Searches for the identifier "$$module$", which Closure uses to uniquely
@@ -44,6 +44,7 @@ exports.checkForUnknownDeps = function() {
  red('Error:'),
  `Unknown dependency ${cyan(match[0])} found in ${cyan(file.relative)}`
  );
+ log(yellow(contents));
  const err = new Error('Compilation failed due to unknown dependency');
  err.showStack = false;
  cb(err, file);

build-system/compile/compile.js

@@ -139,6 +139,7 @@ function compile(
  'third_party/web-animations-externs/web_animations.js',
  'third_party/moment/moment.extern.js',
  'third_party/react-externs/externs.js',
+ 'build-system/externs/preact.extern.js',
  ];
  const define = [`VERSION=${internalRuntimeVersion}`];
  if (argv.pseudo_names) {

build-system/compile/sources.js

@@ -51,6 +51,10 @@ const COMMON_GLOBS = [
  'node_modules/@ampproject/animations/dist/animations.mjs',
  'node_modules/@ampproject/worker-dom/package.json',
  'node_modules/@ampproject/worker-dom/dist/amp/main.mjs',
+ 'node_modules/preact/package.json',
+ 'node_modules/preact/dist/*.js',
+ 'node_modules/preact/hooks/package.json',
+ 'node_modules/preact/hooks/dist/*.js',
 ];
 
 /**

build-system/eslint-rules/no-import.js

@@ -14,19 +14,41 @@
  * limitations under the License.
  */
 'use strict';
-const imports = ['sinon'];
+
+const imports = [
+ {import: 'sinon', message: 'Importing sinon is forbidden'},
+ {
+ import: 'preact',
+ message:
+ "Please import preact from 'src/preact'. This gives us type safety.",
+ },
+ {
+ import: 'preact/hooks',
+ message:
+ "Please import preact/hooks from 'src/preact'. This gives us type safety.",
+ },
+];
+
 module.exports = function(context) {
  return {
  ImportDeclaration(node) {
- const comments = context.getCommentsBefore(node);
+ const comments = context.getCommentsBefore(node.source);
  const ok = comments.some(comment => comment.value === 'OK');
  if (ok) {
  return;
  }
 
  const name = node.source.value;
- if (imports.includes(name)) {
- context.report({node, message: `Importing ${name} is forbidden.`});
+
+ for (const forbidden of imports) {
+ if (name !== forbidden.import) {
+ continue;
+ }
+
+ context.report({
+ node,
+ message: forbidden.message,
+ });
  }
  },
  };

build-system/externs/preact.extern.js

@@ -0,0 +1,56 @@
+/**
+ * Copyright 2020 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.
+ */
+
+/** @externs */
+
+/** @const */
+var Preact = {}
+
+/**
+ * @typedef {function(!JsonObject):Preact.Renderable}
+ */
+Preact.FunctionalComponent
+
+/**
+ * @interface
+ */
+Preact.VNode = function() {}
+
+/**
+ * @interface
+ */
+Preact.Context = function() {}
+
+/**
+ * @param {!JsonObject} props
+ * @return {Preact.Renderable}
+ */
+Preact.Context.prototype.Provider = function(props) {};
+
+/**
+ * @interface
+ */
+Preact.Context.prototype.Consumer = function() {};
+
+/**
+ * @typedef {string|number|boolean|null|undefined}
+ */
+Preact.SimpleRenderable;
+
+/**
+ * @typedef {Preact.SimpleRenderable|!Preact.VNode|!Array<Preact.SimpleRenderable|!Preact.VNode|!Array<Preact.SimpleRenderable|!Preact.VNode>>}
+ */
+Preact.Renderable;

build-system/tasks/check-types.js

@@ -82,7 +82,7 @@ async function checkTypes() {
  {
  include3pDirectories: true,
  includePolyfills: true,
- extraGlobs: ['src/inabox/*.js'],
+ extraGlobs: ['src/inabox/*.js', '!node_modules/preact'],
  typeCheckOnly: true,
  }
  ),