Merge branch 'trunk' into add/9369-product-collection-full-grid-pattern

Author: kmanijak

.github/workflows/check-doc-links.yml

@@ -11,18 +11,23 @@ concurrency:
 permissions: {}
 
 jobs:
-    markdown-link-check:
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-        steps:
-            - uses: actions/checkout@v3
-            - uses: gaurav-nelson/github-action-markdown-link-check@v1
-              with:
-                  use-quiet-mode: 'yes'
-                  use-verbose-mode: 'no'
-                  config-file: '.github/workflows/check-doc-links-config.json'
-                  folder-path: './docs'
-                  file-path: './README.md'
-                  max-depth: 3
-                  base-branch: 'trunk'
+  markdown_link_check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: Install markdown-link-check
+        run: npm install -g markdown-link-check
+
+      - name: Run markdown-link-check
+        run: |
+          find ./docs -path ./docs/internal-developers/testing/releases -prune -o -name "*.md" -print0 | xargs -0 -n1 markdown-link-check -c .github/workflows/check-doc-links-config.json
+

.github/workflows/nightly-builds.yml

@@ -5,6 +5,9 @@ on:
     - cron: '0 0 * * *' # Run at 12 AM UTC.
   workflow_dispatch:
 
+env:
+  NODE_OPTIONS: --max-old-space-size=4096 # development build takes a lot of memory 
+
 jobs:
   build:
     name: Nightly builds

assets/js/atomic/blocks/product-elements/button/style.scss

@@ -3,6 +3,7 @@
 	white-space: normal;
 	display: flex;
 	justify-content: center;
+	flex-direction: column;
 	align-items: center;
 	gap: $gap-small;
 

assets/js/base/components/reviews/review-list-item/index.tsx

@@ -4,7 +4,7 @@
 import { __, sprintf } from '@wordpress/i18n';
 import classNames from 'classnames';
 import ReadMore from '@woocommerce/base-components/read-more';
-import type { BlockAttributes } from '@wordpress/blocks';
+import { ReviewBlockAttributes } from '@woocommerce/blocks/reviews/attributes';
 
 /**
  * Internal dependencies
@@ -154,8 +154,9 @@ function getReviewRating( review: Review ): JSX.Element {
 		</div>
 	);
 }
+
 interface ReviewListItemProps {
-	attributes: BlockAttributes;
+	attributes: ReviewBlockAttributes;
 	review?: Review;
 }
 

assets/js/base/components/reviews/review-list/index.tsx

@@ -2,26 +2,28 @@
  * External dependencies
  */
 import { getSetting } from '@woocommerce/settings';
-import type { BlockAttributes } from '@wordpress/blocks';
+import { ReviewBlockAttributes } from '@woocommerce/blocks/reviews/attributes';
 
 /**
  * Internal dependencies
  */
 import ReviewListItem from '../review-list-item';
 import type { Review } from '../types';
 import './style.scss';
-
 interface ReviewListProps {
-	attributes: BlockAttributes;
+	attributes: ReviewBlockAttributes;
 	reviews: Review[];
 }
 
 const ReviewList = ( {
 	attributes,
 	reviews,
 }: ReviewListProps ): JSX.Element => {
-	const showAvatars = getSetting( 'showAvatars', true );
-	const reviewRatingsEnabled = getSetting( 'reviewRatingsEnabled', true );
+	const showAvatars = getSetting< boolean >( 'showAvatars', true );
+	const reviewRatingsEnabled = getSetting< boolean >(
+		'reviewRatingsEnabled',
+		true
+	);
 	const showReviewImage =
 		( showAvatars || attributes.imageType === 'product' ) &&
 		attributes.showReviewImage;

assets/js/base/context/hooks/collections/use-collection.ts

@@ -49,10 +49,10 @@ export interface useCollectionOptions {
 	isEditor?: boolean;
 }
 
-export const useCollection = (
+export const useCollection = < T >(
 	options: useCollectionOptions
 ): {
-	results: unknown;
+	results: T[];
 	isLoading: boolean;
 } => {
 	const {
@@ -68,7 +68,7 @@ export const useCollection = (
 				'the resource properties.'
 		);
 	}
-	const currentResults = useRef< { results: unknown; isLoading: boolean } >( {
+	const currentResults = useRef< { results: T[]; isLoading: boolean } >( {
 		results: [],
 		isLoading: true,
 	} );
@@ -102,7 +102,7 @@ export const useCollection = (
 			}
 
 			return {
-				results: store.getCollection< T >( ...args ),
+				results: store.getCollection< T[] >( ...args ),
 				isLoading: ! store.hasFinishedResolution(
 					'getCollection',
 					args

assets/js/base/context/hooks/use-store-products.ts

@@ -35,16 +35,17 @@ export const useStoreProducts = (
 		namespace: '/wc/store/v1',
 		resourceName: 'products',
 	};
-	const { results: products, isLoading: productsLoading } = useCollection( {
-		...collectionOptions,
-		query,
-	} );
+	const { results: products, isLoading: productsLoading } =
+		useCollection< ProductResponseItem >( {
+			...collectionOptions,
+			query,
+		} );
 	const { value: totalProducts } = useCollectionHeader( 'x-wp-total', {
 		...collectionOptions,
 		query,
 	} );
 	return {
-		products: products as ProductResponseItem[], // TODO: Remove this once getCollection selector and resolver is converted to TS.
+		products,
 		totalProducts: parseInt( totalProducts as string, 10 ),
 		productsLoading,
 	};

assets/js/blocks/active-filters/active-attribute-filters.tsx

@@ -11,6 +11,7 @@ import { __ } from '@wordpress/i18n';
 import { getSettingWithCoercion } from '@woocommerce/settings';
 import {
 	AttributeObject,
+	AttributeTerm,
 	isAttributeQueryCollection,
 	isAttributeTermCollection,
 	isBoolean,
@@ -47,7 +48,7 @@ const ActiveAttributeFilters = ( {
 	displayStyle,
 	isLoadingCallback,
 }: ActiveAttributeFiltersProps ) => {
-	const { results, isLoading } = useCollection( {
+	const { results, isLoading } = useCollection< AttributeTerm >( {
 		namespace: '/wc/store/v1',
 		resourceName: 'products/attributes/terms',
 		resourceValues: [ attributeObject.id ],

assets/js/blocks/attribute-filter/block.tsx

@@ -19,6 +19,7 @@ import { getSettingWithCoercion } from '@woocommerce/settings';
 import { getQueryArgs, removeQueryArgs } from '@wordpress/url';
 import {
 	AttributeQuery,
+	AttributeTerm,
 	isAttributeQueryCollection,
 	isBoolean,
 	isString,
@@ -124,7 +125,7 @@ const AttributeFilterBlock = ( {
 		useQueryStateByKey( 'attributes', [] );
 
 	const { results: attributeTerms, isLoading: attributeTermsLoading } =
-		useCollection( {
+		useCollection< AttributeTerm >( {
 			namespace: '/wc/store/v1',
 			resourceName: 'products/attributes/terms',
 			resourceValues: [ attributeObject?.id || 0 ],

assets/js/blocks/breadcrumbs/icon.tsx

@@ -0,0 +1,33 @@
+/**
+ * External dependencies
+ */
+import { SVG, Rect } from '@wordpress/primitives';
+
+export const queryPaginationIcon = (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Rect
+			x="4"
+			y="10.5"
+			width="6"
+			height="3"
+			rx="1.5"
+			fill="currentColor"
+		/>
+		<Rect
+			x="12"
+			y="10.5"
+			width="3"
+			height="3"
+			rx="1.5"
+			fill="currentColor"
+		/>
+		<Rect
+			x="17"
+			y="10.5"
+			width="3"
+			height="3"
+			rx="1.5"
+			fill="currentColor"
+		/>
+	</SVG>
+);