rebase code on oct-10-2023

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/assets/js/utils/filters.ts

@@ -6,7 +6,7 @@ import { getSettingWithCoercion } from '@woocommerce/settings';
 import { isBoolean } from '@woocommerce/types';
 
 const filteringForPhpTemplate = getSettingWithCoercion(
-	'isRenderingPhpTemplate',
+	'is_rendering_php_template',
 	false,
 	isBoolean
 );
@@ -34,34 +34,6 @@ export function getUrlParameter( name: string ) {
  */
 export function changeUrl( newUrl: string ) {
 	if ( filteringForPhpTemplate ) {
-		/**
-		 * We want to remove page number from URL whenever filters are changed.
-		 * This will move the user to the first page of results.
-		 *
-		 * There are following page number formats:
-		 * 1. query-{number}-page={number} (ex. query-1-page=2)
-		 * 	- ref: https://github.com/WordPress/gutenberg/blob/5693a62214b6c76d3dc5f3f69d8aad187748af79/packages/block-library/src/query-pagination-numbers/index.php#L18
-		 * 2. query-page={number} (ex. query-page=2)
-		 * 	- ref: same as above
-		 * 3. page/{number} (ex. page/2) (Default WordPress pagination format)
-		 */
-		newUrl = newUrl.replace(
-			/(?:query-(?:\d+-)?page=(\d+))|(?:page\/(\d+))/g,
-			''
-		);
-
-		/**
-		 * If the URL ends with '?', we remove the trailing '?' from the URL.
-		 * The trailing '?' in a URL is unnecessary and can cause the page to
-		 * reload, which can negatively affect performance. By removing the '?',
-		 * we prevent this unnecessary reload. This is safe to do even if there
-		 * are query parameters, as they will not be affected by the removal
-		 * of a trailing '?'.
-		 */
-		if ( newUrl.endsWith( '?' ) ) {
-			newUrl = newUrl.slice( 0, -1 );
-		}
-
 		window.location.href = newUrl;
 	} else {
 		window.history.replaceState( {}, '', newUrl );

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/assets/js/utils/shared-attributes.js

@@ -17,7 +17,7 @@ export default {
 	 */
 	columns: {
 		type: 'number',
-		default: getSetting( 'defaultColumns', 3 ),
+		default: getSetting( 'default_columns', 3 ),
 	},
 
 	/**
@@ -25,7 +25,7 @@ export default {
 	 */
 	rows: {
 		type: 'number',
-		default: getSetting( 'defaultRows', 3 ),
+		default: getSetting( 'default_rows', 3 ),
 	},
 
 	/**