Merge branch 'develop' into trunk

Author: nicholasio

.changeset/itchy-areas-enter.md

@@ -0,0 +1,5 @@
+---
+"@headstartwp/core": patch
+---
+
+Fix: post path matching logic when params.fullPath is set

.changeset/ninety-lemons-care.md

@@ -0,0 +1,6 @@
+---
+"@headstartwp/headstartwp": minor
+"@headstartwp/core": minor
+---
+
+Introducing optimizeYoastPayload to reduce payload size when using the yoast integration

.changeset/weak-cloths-lose.md

@@ -0,0 +1,5 @@
+---
+"@headstartwp/headstartwp": patch
+---
+
+Fix how data-wp-block attribute is set to avoid generating incorrect/insecure markup

.github/workflows/nextjs_bundle_analysis-app-router.yml

@@ -54,7 +54,7 @@ jobs:
           path: ./projects/wp-nextjs-app/.next/analyze/__bundle_analysis.json
 
       - name: Download base branch bundle stats
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v6
         if: success() && github.event.number
         with:
           workflow: nextjs_bundle_analysis.yml

.github/workflows/nextjs_bundle_analysis.yml

@@ -54,7 +54,7 @@ jobs:
           path: ./projects/wp-nextjs/.next/analyze/__bundle_analysis.json
 
       - name: Download base branch bundle stats
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v6
         if: success() && github.event.number
         with:
           workflow: nextjs_bundle_analysis.yml

docs/documentation/06-WordPress Integration/gutenberg.md

@@ -40,14 +40,14 @@ This filter is not as useful as the previous one but it allows you to filter the
 /**
  * Filter's out the block's attributes after serialization
  *
- * @param string $encoded_attrs The serialized block's Attributes
+ * @param string $encoded_attrs The block attributes serialized to a JSON string
  * @param array $attrs The Block's Attributes
  * @param array $block The Block's schema
  * @param \WP_Block $block_instance The block's instance
  */
 $block_attrs_serialized = apply_filters(
     'tenup_headless_wp_render_blocks_attrs_serialized',
-    esc_attr( wp_json_encode( $block_attrs ) ),
+    wp_json_encode( $block_attrs ),
     $block_attrs,
     $block,
     $block_instance

packages/core/src/data/strategies/AbstractFetchStrategy.ts

@@ -28,6 +28,13 @@ export interface EndpointParams {
 	 */
 	lang?: string;
 
+	/**
+	 * The custom parameter to optimize the Yoast payload.
+	 *
+	 * This is only used if the YoastSEO integration is enabled
+	 */
+	optimizeYoastPayload?: boolean;
+
 	[k: string]: unknown;
 }
 

packages/core/src/data/strategies/AuthorArchiveFetchStrategy.ts

@@ -1,4 +1,4 @@
-import { getCustomTaxonomies } from '../../utils';
+import { getCustomTaxonomies, getSiteBySourceUrl } from '../../utils';
 import { PostEntity } from '../types';
 import { authorArchivesMatchers } from '../utils/matchers';
 import { parsePath } from '../utils/parsePath';
@@ -25,6 +25,10 @@ export class AuthorArchiveFetchStrategy<
 		const matchers = [...authorArchivesMatchers];
 		const customTaxonomies = getCustomTaxonomies(this.baseURL);
 
+		const config = getSiteBySourceUrl(this.baseURL);
+
+		this.optimizeYoastPayload = !!config.integrations?.yoastSEO?.optimizeYoastPayload;
+
 		customTaxonomies?.forEach((taxonomy) => {
 			const slug = taxonomy?.rewrite ?? taxonomy.slug;
 			matchers.push({

packages/core/src/data/strategies/PostOrPostsFetchStrategy.ts

@@ -8,7 +8,7 @@ import {
 } from './AbstractFetchStrategy';
 import { PostParams, SinglePostFetchStrategy } from './SinglePostFetchStrategy';
 import { PostsArchiveFetchStrategy, PostsArchiveParams } from './PostsArchiveFetchStrategy';
-import { FrameworkError, NotFoundError } from '../../utils';
+import { FrameworkError, NotFoundError, getSiteBySourceUrl } from '../../utils';
 
 /**
  * The params supported by {@link PostOrPostsFetchStrategy}
@@ -61,11 +61,17 @@ export class PostOrPostsFetchStrategy<
 
 	postsStrategy: PostsArchiveFetchStrategy = new PostsArchiveFetchStrategy(this.baseURL);
 
+	optimizeYoastPayload: boolean = false;
+
 	getDefaultEndpoint(): string {
 		return '@postOrPosts';
 	}
 
 	getParamsFromURL(path: string, params: Partial<P> = {}): Partial<P> {
+		const config = getSiteBySourceUrl(this.baseURL);
+
+		this.optimizeYoastPayload = !!config.integrations?.yoastSEO?.optimizeYoastPayload;
+
 		this.urlParams = {
 			single: this.postStrategy.getParamsFromURL(path, params.single),
 			archive: this.postsStrategy.getParamsFromURL(path, params.archive),

packages/core/src/data/strategies/PostsArchiveFetchStrategy.ts

@@ -211,6 +211,8 @@ export class PostsArchiveFetchStrategy<
 
 	locale: string = '';
 
+	optimizeYoastPayload: boolean = false;
+
 	getDefaultEndpoint(): string {
 		return endpoints.posts;
 	}
@@ -234,6 +236,8 @@ export class PostsArchiveFetchStrategy<
 		this.locale = config.integrations?.polylang?.enable && params.lang ? params.lang : '';
 		this.path = path;
 
+		this.optimizeYoastPayload = !!config.integrations?.yoastSEO?.optimizeYoastPayload;
+
 		const matchers = [...postsMatchers];
 
 		if (typeof params.taxonomy === 'string') {
@@ -457,6 +461,12 @@ export class PostsArchiveFetchStrategy<
 			}
 		}
 
+		if (this.optimizeYoastPayload) {
+			finalUrl = addQueryArgs(finalUrl, {
+				optimizeYoastPayload: true,
+			});
+		}
+
 		return super.fetcher(finalUrl, params, options);
 	}