Merge branch 'develop' of github.com:ampproject/amp-wp into update/amphtml-2004041903580

* 'develop' of github.com:ampproject/amp-wp: (48 commits)
  Bump https-proxy-agent from 2.2.2 to 2.2.4 (#4596)
  Update dependency babel-jest to v25.3.0 (#4550)
  Update dependency core-js to v3.6.5 (#4558)
  For the 'Preview AMP' button, use a title instead of a tooltip (#4601)
  Bump stable tag to 1.5.3
  Fix handling of Mustache templates (#4583)
  Stub request based on test scenario (#4588)
  Return early instead of storing eventual return value in variable
  Improve phpdoc and logic conditions
  Update links in pull request template
  Update contributing.md with link to wiki
  Remove engineering.md now that it is on the wiki
  Remove project-management.md since only applicable to Stories
  Add conditions for comment feed, trackback, robots, and favicon
  Fix typo in global phpdoc
  Update tests after block-library/style.css changes in Gutenberg 7.9 (#4579)
  Remove special conditions for Reader mode; remove need for $exit condition in redirects
  Fix translators comment
  Add comment explaining short-circuit behavior when query var is present
  Update version for _doing_it_wrong() from 1.5.3 to 1.6.0
  ...

Author: westonruter

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,6 +5,6 @@ Fixes #
 
 ## Checklist
 
-- [ ] My pull request is addressing an [open issue](https://github.com/ampproject/amp-wp/contributing/project-management.md#life-of-an-issue) (please create one otherwise).
-- [ ] My code is tested and passes existing [tests](https://github.com/ampproject/amp-wp/contributing/engineering.md#tests).
-- [ ] My code follows the [Engineering Guidelines](https://github.com/ampproject/amp-wp/contributing/engineering.md) (updates are often made to the guidelines, check it out periodically).
+- [ ] My pull request is addressing an open issue (please create one otherwise).
+- [ ] My code is tested and passes existing [tests](https://github.com/ampproject/amp-wp/wiki/Engineering-Guidelines#tests).
+- [ ] My code follows the [Engineering Guidelines](https://github.com/ampproject/amp-wp/wiki/Engineering-Guidelines) (updates are often made to the guidelines, check it out periodically).

assets/src/block-editor/components/amp-preview.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
  * WordPress dependencies
  */
 import { Component, createRef, renderToString } from '@wordpress/element';
-import { Button, Icon, Tooltip } from '@wordpress/components';
+import { Button, Icon } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
@@ -236,25 +236,23 @@ class AMPPreview extends Component {
 
 		return (
 			isEnabled && ! errorMessages.length && ! isStandardMode && (
-				<Tooltip text={ __( 'Preview AMP', 'amp' ) } >
-					<Button
-						className="amp-editor-post-preview"
-						href={ href }
-						label={ __( 'Preview AMP', 'amp' ) }
-						isSecondary
-						disabled={ ! isSaveable }
-						onClick={ this.openPreviewWindow }
-						ref={ this.buttonRef }
-					>
-						{ ampFilledIcon( { viewBox: '0 0 62 62', width: 18, height: 18 } ) }
-						<span className="screen-reader-text">
-							{
-								/* translators: accessibility text */
-								__( '(opens in a new tab)', 'amp' )
-							}
-						</span>
-					</Button>
-				</Tooltip>
+				<Button
+					className="amp-editor-post-preview"
+					href={ href }
+					title={ __( 'Preview AMP', 'amp' ) }
+					isSecondary
+					disabled={ ! isSaveable }
+					onClick={ this.openPreviewWindow }
+					ref={ this.buttonRef }
+				>
+					{ ampFilledIcon( { viewBox: '0 0 62 62', width: 18, height: 18 } ) }
+					<span className="screen-reader-text">
+						{
+							/* translators: accessibility text */
+							__( '(opens in a new tab)', 'amp' )
+						}
+					</span>
+				</Button>
 			)
 		);
 	}

contributing.md

@@ -1,46 +1 @@
-# AMP contributing guide
-
-We'd love to accept your patches and contributions to this project and hope you'll become an ongoing participant in our open source community but we also welcome one-off contributions for the issues you're particularly passionate about.
-
-**How would you like to help?**
-
-* [Report a bug](#report-a-bug)
-* [Make a suggestion](#make-a-suggestion)
-* [Contribute code](#product-and-code-contributions)
-
-## Report a bug
-
-[File an issue](https://github.com/ampproject/amp-wp/issues/new?template=bug_report.md) if you find a bug in the AMP Plugin. Providing details for each section predefined in the issue template is much appreciated!
-
-Project maintainers are regularly monitoring issues and aim to fix open bugs quickly.
-
-## Make a suggestion
-
-[File a "feature request" issue](https://github.com/ampproject/amp-wp/issues/new?template=feature_request.md) if you have a suggestion for a way to improve the AMP Plugin, or a request for a new feature.
-
-## Product and code contributions
-
-We'd love to have your help contributing code and features to the AMP Plugin! Head to the [Project Management guidelines](https://github.com/ampproject/amp-wp/blob/develop/contributing/project-management.md) as well as [Engineering guidelines](https://github.com/ampproject/amp-wp/blob/develop/contributing/engineering.md) for details on the process you can use to contribute.
-
-## Contributor license agreement
-
-Contributions to this project must be accompanied by a Contributor License Agreement. You (or your employer) retain the copyright to your contribution; this simply gives us permission to use and redistribute your contributions as part of the project. Head over to https://cla.developers.google.com/ to see your current agreements on file or to sign a new one.
-
-You generally only need to submit a CLA once, so if you've already submitted one (even if it was for a different project), you probably don't need to do it again.
-
-## Contributors list policy
-
-The list of contributors who are featured on the WordPress.org plugin directory are subject to change over time. The organizations and individuals who contribute significantly and consistently (e.g. 3-month period) to the project are eligible to be listed. Those listed should generally be considered as those who take responsibility for the project (i.e. owners). Note that contributions include more than just code, though contributors who commit are [most visible](https://github.com/ampproject/amp-wp/graphs/contributors). The sort order of the contributors list should generally follow the sort order of the GitHub contributors page, though again, this order does not consider work in issues and the support forum, so it cannot be relied on solely.
-
-## Community guidelines
-
-This project follows
-[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
-
-## Security disclosures
-
-The AMP Project accepts responsible security disclosures through the [Google Application Security program](https://www.google.com/about/appsecurity/).
-
-## Code of conduct
-
-In addition to the Community Guidelines, this project follows an explicit [Code of Conduct](https://github.com/ampproject/amp-wp/blob/develop/code_of_conduct.md).
+This document has moved to the [Contributing](https://github.com/ampproject/amp-wp/wiki/Contributing) page on the wiki.