Merge branch 'master' into release/2.5

Author: Aljullu

CONTRIBUTING.md

@@ -48,6 +48,10 @@ Run `$ npm run package-plugin` to trigger install and build, and then create a z
 
 These instructions cover new releases of the blocks plugin for those with commit access.
 
+### Prerequisites
+
+- Have [Github's Hub](https://github.com/github/hub) cli installed and authenticated.
+
 **Before any release** ensure you update:
 
 - The `readme.txt` file supported versions, changelog and list of blocks if the release includes new blocks.
@@ -80,6 +84,36 @@ This will ask for a tagged version number, check it out from GitHub, check out t
 
 __Important:__ Before running the release script ensure you have already pushed a new release to GitHub.
 
+### Bumping the version
+
+After you release, create a commit to master that updates the version to the next minor with a `-dev` suffix.  For example, if you just released `2.5.0`, you'd do an update changing the version to `2.6.0-dev`.  See an [example here](https://github.com/woocommerce/woocommerce-gutenberg-products-block/commit/e27f053e7be0bf7c1d376f5bdb9d9999190ce158).
+
+## Updating a single file in WordPress.org
+
+Sometimes, we need to update a single file in WordPress.org without wanting to do a full release, for example, updating the `readme.txt` versions or descriptions. In order to do that, refer to the _[Editing Existing Files](https://developer.wordpress.org/plugins/wordpress-org/how-to-use-subversion/#editing-existing-files)_ section of the Subversion guide in developer.wordpress.org or follow these steps:
+
+1. Checkout the plugin repo:
+
+```
+svn co "http://plugins.svn.wordpress.org/woo-gutenberg-products-block/"
+cd woo-gutenberg-products-block
+```
+
+2. Modify the files you want to change in `trunk` or `tags/x.y.z`.
+
+3. Check your changes with:
+
+```
+svn stat
+svn diff
+```
+
+4. Commit the changes to the server:
+
+```
+svn ci -m "Updated readme.txt description"
+```
+
 ## Publishing `@woocommerce/block-library`
 
 In the past, we published the blocks to NPM at [@woocommerce/block-library](https://www.npmjs.com/package/@woocommerce/block-library).

assets/js/base/components/product-list/container.js

@@ -1,59 +1,39 @@
 /**
  * External dependencies
  */
-import { Component } from 'react';
+import { useState } from '@wordpress/element';
 import PropTypes from 'prop-types';
-import withQueryStringValues from '@woocommerce/base-hocs/with-query-string-values';
 
 /**
  * Internal dependencies
  */
 import ProductList from './index';
 
-class ProductListContainer extends Component {
-	onPageChange = ( newPage ) => {
-		this.props.updateQueryStringValues( {
-			product_page: newPage,
-		} );
+const ProductListContainer = ( { attributes } ) => {
+	const [ currentPage, setPage ] = useState( 1 );
+	const [ currentSort, setSort ] = useState( attributes.orderby );
+	const onPageChange = ( newPage ) => {
+		setPage( newPage );
 	};
-
-	onSortChange = ( event ) => {
+	const onSortChange = ( event ) => {
 		const newSortValue = event.target.value;
-		this.props.updateQueryStringValues( {
-			product_sort: newSortValue,
-			product_page: 1,
-		} );
+		setSort( newSortValue );
+		setPage( 1 );
 	};
 
-	render() {
-		// eslint-disable-next-line camelcase
-		const { attributes, product_page, product_sort } = this.props;
-		const currentPage = parseInt( product_page );
-		const sortValue = product_sort || attributes.orderby; // eslint-disable-line camelcase
-
-		return (
-			<ProductList
-				attributes={ attributes }
-				currentPage={ currentPage }
-				onPageChange={ this.onPageChange }
-				onSortChange={ this.onSortChange }
-				sortValue={ sortValue }
-			/>
-		);
-	}
-}
+	return (
+		<ProductList
+			attributes={ attributes }
+			currentPage={ currentPage }
+			onPageChange={ onPageChange }
+			onSortChange={ onSortChange }
+			sortValue={ currentSort }
+		/>
+	);
+};
 
 ProductListContainer.propTypes = {
 	attributes: PropTypes.object.isRequired,
-	// From withQueryStringValues
-	product_page: PropTypes.oneOfType( [ PropTypes.number, PropTypes.string ] ),
-	product_sort: PropTypes.string,
-};
-
-ProductListContainer.defaultProps = {
-	product_page: 1,
 };
 
-export default withQueryStringValues( [ 'product_page', 'product_sort' ] )(
-	ProductListContainer
-);
+export default ProductListContainer;