Merge pull request #1734 from ampproject/update/1.0.1-release

Update the readme and amp.php for the 1.0.1 release

Gruntfile.js

@@ -9,17 +9,6 @@ module.exports = function( grunt ) {
 
 		pkg: grunt.file.readJSON( 'package.json' ),
 
-		// JavaScript linting with JSHint.
-		jshint: {
-			options: {
-				jshintrc: '.jshintrc'
-			},
-			all: [
-				'Gruntfile.js',
-				'assets/**/*.js'
-			]
-		},
-
 		// Clean up the build.
 		clean: {
 			build: {
@@ -72,7 +61,6 @@ module.exports = function( grunt ) {
 	// Load tasks.
 	grunt.loadNpmTasks( 'grunt-contrib-clean' );
 	grunt.loadNpmTasks( 'grunt-contrib-copy' );
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-shell' );
 	grunt.loadNpmTasks( 'grunt-wp-deploy' );
 
@@ -180,7 +168,6 @@ module.exports = function( grunt ) {
 	] );
 
 	grunt.registerTask( 'deploy', [
-		'jshint',
 		'shell:phpunit',
 		'shell:verify_matching_versions',
 		'wp_deploy'

amp.php

@@ -5,7 +5,7 @@
  * Plugin URI: https://amp-wp.org
  * Author: WordPress.com VIP, XWP, Google, and contributors
  * Author URI: https://github.com/ampproject/amp-wp/graphs/contributors
- * Version: 1.0.1-alpha1
+ * Version: 1.0.1
  * Text Domain: amp
  * Domain Path: /languages/
  * License: GPLv2 or later
@@ -83,7 +83,7 @@ function _amp_print_composer_install_admin_notice() {
 
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '1.0.1-alpha1' );
+define( 'AMP__VERSION', '1.0.1' );
 
 /**
  * Print admin notice if plugin installed with incorrect slug (which impacts WordPress's auto-update system).

contributing.md

@@ -19,6 +19,10 @@ again.
 
 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.
 
+## Branches
+
+To include your changes in the next patch release (e.g. `1.0.x`), please base your branch off of the current release branch (e.g. `1.0`) and open your pull request back to that branch. If you open your pull request with the `develop` branch then it will be by default included in the next minor version (e.g. `1.x`).
+
 ## Code Reviews
 
 All submissions, including submissions by project members, require review. We
@@ -134,17 +138,19 @@ When you push a commit to your PR, Travis CI will run the PHPUnit tests and snif
 
 Contributors who want to make a new release, follow these steps:
 
-1. Do `npm run build` and install the `amp.zip` onto a normal WordPress install running a stable release build; do smoke test to ensure it works.
-2. Bump plugin versions in `amp.php` (×2: the metadata block in the header and also the `AMP__VERSION` constant).
-3. Add changelog entry to readme.
-4. Draft blog post about the new release.
-5. [Draft new release](https://github.com/ampproject/amp-wp/releases/new) on GitHub targeting the release branch, with the new plugin version as the tag and release title. Attaching the `amp.zip` build to the release. Include link to changelog in release tag.
-6. Run `npm run deploy` to to commit the plugin to WordPress.org.
-7. Confirm the release is available on WordPress.org; try installing it on a WordPress install and confirm it works.
-8. Publish GitHub release.
-9. Create built release tag: `git fetch --tags && git checkout $(git tag | tail -n1) && ./bin/tag-built.sh` (then add link from release)
-10. Create a new branch off of the release branch, merge `develop` into it and resolve conflicts (e.g. with version and changelog), and then open pull request to merge changes into `develop`.
-11. Merge release tag into `master`.
-12. Publish release blog post, including link to GitHub release.
-13. Close the GitHub milestone and project.
-14. Make announcements.
+0. Do `git submodule update --init --recursive && npm install && composer selfupdate && composer install && wp cli update`.
+1. Bump plugin versions in `amp.php` (×2: the metadata block in the header and also the `AMP__VERSION` constant). Verify via `npx grunt shell:verify_matching_versions`.
+2. Add changelog entry to readme.
+3. Do `npm run build` and install the `amp.zip` onto a normal WordPress install running a stable release build; do smoke test to ensure it works.
+4. Do sanity check by comparing the `build` directory with the previously-deployed plugin at http://plugins.svn.wordpress.org/amp/trunk
+5. Draft blog post about the new release.
+6. [Draft new release](https://github.com/ampproject/amp-wp/releases/new) on GitHub targeting the release branch, with the new plugin version as the tag and release title. Attaching the `amp.zip` build to the release. Include link to changelog in release tag.
+7. Run `npm run deploy` to commit the plugin to WordPress.org.
+8. Confirm the release is available on WordPress.org; try installing it on a WordPress install and confirm it works.
+9. Publish GitHub release.
+10. Create built release tag: `git fetch --tags && git checkout $(git tag | tail -n1) && ./bin/tag-built.sh` (then add link from release)
+11. Create a new branch off of the release branch (e.g. `update/develop-with-1.0.x`), merge `develop` into it and resolve conflicts (e.g. with version and changelog), and then open pull request to merge changes into `develop`.
+12. Merge release tag into `master`.
+13. Publish release blog post, including link to GitHub release.
+14. Close the GitHub milestone and project.
+15. Make announcements.

package.json

@@ -23,7 +23,6 @@
   "grunt": "^1.0.2",
   "grunt-contrib-clean": "^1.1.0",
   "grunt-contrib-copy": "^1.0.0",
-  "grunt-contrib-jshint": "^1.1.0",
   "grunt-shell": "^2.1.0",
   "grunt-wp-deploy": "^1.2.1",
   "timeago.js": "3.0.2",

readme.md

@@ -8,7 +8,7 @@ Enable AMP on your WordPress site, the WordPress way.
 **Tags:** [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile)  
 **Requires at least:** 4.9  
 **Tested up to:** 5.0  
-**Stable tag:** 1.0.0  
+**Stable tag:** 1.0.1  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 **Requires PHP:** 5.3.6  
 
@@ -85,11 +85,18 @@ If you are a developer, we encourage you to follow along or [contribute](https:/
 
 ## Changelog ##
 
-### 1.0.1 (Unreleased) ###
-...
+### 1.0.1 (2018-12-12) ###
+- Add check for required iconv extension. See [#1727](https://github.com/ampproject/amp-wp/pull/1727). Props westonruter.
+- Plugin Conflict: Also using Give plugin currently creates 500 server error when viewing /wp-admin/. See [#1720](https://github.com/ampproject/amp-wp/issues/1720). Props KZeni, westonruter.
+- Fix Plugin Conflict with Give plugin (previously created 500 server error when viewing site admin). See [#1725](https://github.com/ampproject/amp-wp/pull/1725). Props KZeni.
+- Second argument of the_title filter is an Int not WP_Post. See [#1723](https://github.com/ampproject/amp-wp/pull/1723). Props lesterchan, westonruter.
+- Prevent image with caption from overflowing its container in Classic mode. See [#1728](https://github.com/ampproject/amp-wp/pull/1728). Props kienstra.
+- Ensure Schema.org meta data has correct date. See [#1721](https://github.com/ampproject/amp-wp/pull/1721). Props westonruter.
+
+See [1.0.1 release](https://github.com/ampproject/amp-wp/releases/tag/1.0.1).
 
 ### 1.0.0 (2018-12-05)  ###
-To learn how to use the new features in this release, please see the wiki pages for [Adding Theme Support](https://github.com/ampproject/amp-wp/wiki/Adding-Theme-Support) and [Implementing Interactivity](https://github.com/ampproject/amp-wp/wiki/Implementing-Interactivity).
+To learn how to use the new features in this release, please see the documentation for [Serving Strategies](https://amp-wp.org/documentation/how-the-plugin-works/amp-plugin-serving-strategies/) and [Implementing Interactivity](https://amp-wp.org/documentation/playbooks/implementing-interactivity/).
 
 - **Add runtime CSS minification, `!important` replacement, and tree shaking.** See [#1048](https://github.com/ampproject/amp-wp/pull/1048), [#1111](https://github.com/ampproject/amp-wp/pull/1111), [#1142](https://github.com/ampproject/amp-wp/pull/1142), [#1320](https://github.com/ampproject/amp-wp/pull/1320), [#1073](https://github.com/ampproject/amp-wp/issues/1073). Props westonruter, hellofromtonya, amedina, pbakaus, igrigorik, camelburrito.
 - **Keep track of new validation errors and add ability to accept/reject in order to allow or block AMP for a given URL.** See [#1003](https://github.com/ampproject/amp-wp/issues/1003). Props westonruter.

readme.txt

@@ -3,7 +3,7 @@ Contributors: automattic, xwp, google, westonruter, ryankienstra, batmoo, stubgo
 Tags: amp, mobile
 Requires at least: 4.9
 Tested up to: 5.0
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Requires PHP: 5.3.6
@@ -52,13 +52,20 @@ If you are a developer, we encourage you to follow along or [contribute](https:/
 
 == Changelog ==
 
-= 1.0.1 (Unreleased) =
+= 1.0.1 (2018-12-12) =
 
-...
+- Add check for required iconv extension. See [#1727](https://github.com/ampproject/amp-wp/pull/1727). Props westonruter.
+- Plugin Conflict: Also using Give plugin currently creates 500 server error when viewing /wp-admin/. See [#1720](https://github.com/ampproject/amp-wp/issues/1720). Props KZeni, westonruter.
+- Fix Plugin Conflict with Give plugin (previously created 500 server error when viewing site admin). See [#1725](https://github.com/ampproject/amp-wp/pull/1725). Props KZeni.
+- Second argument of the_title filter is an Int not WP_Post. See [#1723](https://github.com/ampproject/amp-wp/pull/1723). Props lesterchan, westonruter.
+- Prevent image with caption from overflowing its container in Classic mode. See [#1728](https://github.com/ampproject/amp-wp/pull/1728). Props kienstra.
+- Ensure Schema.org meta data has correct date. See [#1721](https://github.com/ampproject/amp-wp/pull/1721). Props westonruter.
+
+See [1.0.1 release](https://github.com/ampproject/amp-wp/releases/tag/1.0.1).
 
 = 1.0.0 (2018-12-05)  =
 
-To learn how to use the new features in this release, please see the wiki pages for [Adding Theme Support](https://github.com/ampproject/amp-wp/wiki/Adding-Theme-Support) and [Implementing Interactivity](https://github.com/ampproject/amp-wp/wiki/Implementing-Interactivity).
+To learn how to use the new features in this release, please see the documentation for [Serving Strategies](https://amp-wp.org/documentation/how-the-plugin-works/amp-plugin-serving-strategies/) and [Implementing Interactivity](https://amp-wp.org/documentation/playbooks/implementing-interactivity/).
 
 - **Add runtime CSS minification, `!important` replacement, and tree shaking.** See [#1048](https://github.com/ampproject/amp-wp/pull/1048), [#1111](https://github.com/ampproject/amp-wp/pull/1111), [#1142](https://github.com/ampproject/amp-wp/pull/1142), [#1320](https://github.com/ampproject/amp-wp/pull/1320), [#1073](https://github.com/ampproject/amp-wp/issues/1073). Props westonruter, hellofromtonya, amedina, pbakaus, igrigorik, camelburrito.
 - **Keep track of new validation errors and add ability to accept/reject in order to allow or block AMP for a given URL.** See [#1003](https://github.com/ampproject/amp-wp/issues/1003). Props westonruter.