From 43141d2e3a96762b456293d02ddc2d4f956b7c9a Mon Sep 17 00:00:00 2001
From: Amaan Khan <amaanpathan5@gmail.com>
Date: Mon, 3 Mar 2025 22:05:48 +0530
Subject: [PATCH 01/11] feat: add feat/jsdoc-require-returns-type eslint rule

---
 .eslintrc.cjs                                       |  1 +
 packages/blocks/src/block-manager/index.tsx         |  6 ++++--
 packages/blocks/src/blocks/core-audio.tsx           |  2 +-
 packages/blocks/src/blocks/core-button.tsx          |  2 +-
 packages/blocks/src/blocks/core-buttons.tsx         |  2 +-
 packages/blocks/src/blocks/core-code.tsx            |  2 +-
 packages/blocks/src/blocks/core-column.tsx          |  2 +-
 packages/blocks/src/blocks/core-columns.tsx         |  2 +-
 packages/blocks/src/blocks/core-cover.tsx           |  5 +++--
 packages/blocks/src/blocks/core-details.tsx         |  2 +-
 packages/blocks/src/blocks/core-file.tsx            |  2 +-
 packages/blocks/src/blocks/core-freeform.tsx        |  2 +-
 packages/blocks/src/blocks/core-gallery.tsx         |  2 +-
 packages/blocks/src/blocks/core-group.tsx           |  4 ++--
 packages/blocks/src/blocks/core-heading.tsx         |  2 +-
 packages/blocks/src/blocks/core-html.tsx            |  2 +-
 packages/blocks/src/blocks/core-image.tsx           | 13 +++++++------
 packages/blocks/src/blocks/core-list-item.tsx       |  2 +-
 packages/blocks/src/blocks/core-list.tsx            |  2 +-
 packages/blocks/src/blocks/core-media-text.tsx      |  6 ++++--
 packages/blocks/src/blocks/core-paragraph.tsx       |  2 +-
 packages/blocks/src/blocks/core-pattern.tsx         |  2 +-
 packages/blocks/src/blocks/core-post-content.tsx    |  2 +-
 packages/blocks/src/blocks/core-preformatted.tsx    |  2 +-
 packages/blocks/src/blocks/core-pullquote.tsx       |  2 +-
 packages/blocks/src/blocks/core-quote.tsx           |  2 +-
 packages/blocks/src/blocks/core-separator.tsx       |  2 +-
 packages/blocks/src/blocks/core-spacer.tsx          |  2 +-
 packages/blocks/src/blocks/core-template-part.tsx   |  2 +-
 packages/blocks/src/blocks/core-verse.tsx           |  2 +-
 packages/blocks/src/blocks/core-video.tsx           |  4 ++--
 packages/blocks/src/blocks/default.tsx              |  3 ++-
 .../blocks/src/editor-blocks-renderer/index.tsx     |  3 ++-
 .../blocks/src/utils/flat-list-to-hierarchical.ts   |  3 ++-
 packages/core/src/config/snapwp-config-manager.ts   | 12 +++++++-----
 .../src/config/tests/snapwp-config-manager.test.tsx |  2 +-
 packages/core/src/logger/index.ts                   | 10 +++++-----
 packages/core/src/utils/cn.ts                       |  3 ++-
 .../src/utils/find-element-and-get-class-names.ts   |  2 +-
 packages/core/src/utils/generate-graphql-url.ts     |  2 +-
 .../core/src/utils/get-class-names-from-string.ts   |  3 ++-
 packages/core/src/utils/get-color-class-name.ts     |  3 ++-
 .../src/utils/get-image-size-from-attributes.ts     |  3 ++-
 .../core/src/utils/get-px-for-size-attribute.ts     |  3 ++-
 .../core/src/utils/get-spacing-preset-css-var.ts    |  2 +-
 .../core/src/utils/get-style-object-from-string.ts  |  9 ++++++---
 .../core/src/utils/get-styles-from-attributes.ts    |  3 ++-
 packages/core/src/utils/is-valid-url.ts             |  3 ++-
 .../src/utils/parse-external-remote-patterns.ts     |  3 ++-
 packages/core/src/utils/replace-host-url.ts         |  3 ++-
 packages/core/src/utils/url-slash-modify.ts         |  8 ++++----
 packages/next/src/components/default-error.tsx      |  2 +-
 packages/next/src/components/font.tsx               |  3 ++-
 packages/next/src/components/image.tsx              |  2 +-
 packages/next/src/components/link.tsx               |  2 +-
 packages/next/src/components/script-module.tsx      |  3 ++-
 packages/next/src/components/script.tsx             |  3 ++-
 packages/next/src/config/with-snap-wp.ts            | 12 ++++++++----
 packages/next/src/middleware/cors.ts                |  7 ++++---
 packages/next/src/middleware/current-path.ts        |  3 ++-
 packages/next/src/middleware/proxies.ts             |  3 ++-
 packages/next/src/middleware/utils.ts               |  4 ++--
 packages/next/src/react-parser/index.tsx            |  3 ++-
 packages/next/src/react-parser/options.tsx          |  3 ++-
 packages/next/src/root-layout/global-head.tsx       |  3 ++-
 packages/next/src/root-layout/index.tsx             |  2 +-
 packages/next/src/template-renderer/index.tsx       |  3 ++-
 .../next/src/template-renderer/template-head.tsx    |  3 ++-
 .../next/src/template-renderer/template-scripts.tsx | 12 ++++++++----
 packages/query/src/query-engine/index.ts            | 11 +++++++----
 packages/query/src/utils/parse-global-styles.ts     |  2 +-
 packages/query/src/utils/parse-template.ts          | 12 ++++++------
 72 files changed, 157 insertions(+), 111 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 69c66330..b6ffd96d 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -71,6 +71,7 @@ module.exports = {
 
 		// Turn of JSdoc types and use TypeScript types instead.
 		'jsdoc/no-types': [ 'off' ],
+		'jsdoc/require-returns-type': [ 'error' ],
 
 		// Restrict the use of empty functions.
 		'no-empty-function': 'error',
diff --git a/packages/blocks/src/block-manager/index.tsx b/packages/blocks/src/block-manager/index.tsx
index ec9392aa..84c011f2 100644
--- a/packages/blocks/src/block-manager/index.tsx
+++ b/packages/blocks/src/block-manager/index.tsx
@@ -24,7 +24,8 @@ export default class BlockManager {
 	/**
 	 * Function to convert a flat list of blocks to a tree depending on `clientId` and `parentClientId`
 	 * @param blockList - A flat list of blocks.
-	 * @return A tree of blocks.
+	 *
+	 * @return {Array<BlockTreeNode>} A tree of blocks.
 	 */
 	public static flatListToHierarchical(
 		blockList?: BlockData[] | null
@@ -72,7 +73,8 @@ export default class BlockManager {
 	/**
 	 * Pre processes a flat list of blocks for rendering.
 	 * @param blockList - A flat list of blocks.
-	 * @return A tree of blocks with render functions.
+	 *
+	 * @return {Array<BlockTreeNode>} A tree of blocks with render functions.
 	 */
 	public static parseBlockForRendering(
 		blockList?: BlockData[] | null
diff --git a/packages/blocks/src/blocks/core-audio.tsx b/packages/blocks/src/blocks/core-audio.tsx
index 8fc64696..5fd49ba9 100644
--- a/packages/blocks/src/blocks/core-audio.tsx
+++ b/packages/blocks/src/blocks/core-audio.tsx
@@ -13,7 +13,7 @@ import type { CoreAudio as CoreAudioType, CoreAudioProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element|null} The rendered block.
  */
 const CoreAudio: CoreAudioType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-button.tsx b/packages/blocks/src/blocks/core-button.tsx
index c56674f1..77a67e57 100644
--- a/packages/blocks/src/blocks/core-button.tsx
+++ b/packages/blocks/src/blocks/core-button.tsx
@@ -13,7 +13,7 @@ import type {
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreButton: CoreButtonType = ( { attributes }: CoreButtonProps ) => {
 	const {
diff --git a/packages/blocks/src/blocks/core-buttons.tsx b/packages/blocks/src/blocks/core-buttons.tsx
index d3af3184..bff9f12f 100644
--- a/packages/blocks/src/blocks/core-buttons.tsx
+++ b/packages/blocks/src/blocks/core-buttons.tsx
@@ -12,7 +12,7 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreButtons: CoreButtonsType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-code.tsx b/packages/blocks/src/blocks/core-code.tsx
index 736c8a10..511bfbeb 100644
--- a/packages/blocks/src/blocks/core-code.tsx
+++ b/packages/blocks/src/blocks/core-code.tsx
@@ -9,7 +9,7 @@ import type { CoreCode as CoreCodeType, CoreCodeProps } from '@snapwp/types';
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreCode: CoreCodeType = ( { attributes }: CoreCodeProps ) => {
 	const { style, cssClassName, content } = attributes || {};
diff --git a/packages/blocks/src/blocks/core-column.tsx b/packages/blocks/src/blocks/core-column.tsx
index 8d9af039..a92eafc0 100644
--- a/packages/blocks/src/blocks/core-column.tsx
+++ b/packages/blocks/src/blocks/core-column.tsx
@@ -12,7 +12,7 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreColumn: CoreColumnType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-columns.tsx b/packages/blocks/src/blocks/core-columns.tsx
index 59a677cf..e1440254 100644
--- a/packages/blocks/src/blocks/core-columns.tsx
+++ b/packages/blocks/src/blocks/core-columns.tsx
@@ -12,7 +12,7 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreColumns: CoreColumnsType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-cover.tsx b/packages/blocks/src/blocks/core-cover.tsx
index 992db7f4..ef1badac 100644
--- a/packages/blocks/src/blocks/core-cover.tsx
+++ b/packages/blocks/src/blocks/core-cover.tsx
@@ -23,7 +23,7 @@ const DEFAULT_FOCAL_POINT = { x: 0.5, y: 0.5 };
  *
  * @param focalPoint - The focal point coordinates object containing x and y values.
  *
- * @return CSS position string or undefined if no focal point
+ * @return {string} CSS position string or undefined if no focal point
  */
 const mediaPosition = ( focalPoint?: FocalPoint | null ): string => {
 	if ( ! focalPoint ) {
@@ -42,7 +42,8 @@ const mediaPosition = ( focalPoint?: FocalPoint | null ): string => {
  * @param root0.renderedHtml - Pre-rendered HTML string for class extraction
  * @param root0.connectedMediaItem - The connected media item object
  * @param root0.mediaDetails - The media details object
- * @return The rendered cover block or null if using featured image
+ *
+ * @return {React.JSX.Element} The rendered cover block or null if using featured image
  */
 const CoreCover: CoreCoverType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-details.tsx b/packages/blocks/src/blocks/core-details.tsx
index 9ffeb2cc..de39d339 100644
--- a/packages/blocks/src/blocks/core-details.tsx
+++ b/packages/blocks/src/blocks/core-details.tsx
@@ -17,7 +17,7 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreDetails: CoreDetailsType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-file.tsx b/packages/blocks/src/blocks/core-file.tsx
index 68d93eb3..8c8a6538 100644
--- a/packages/blocks/src/blocks/core-file.tsx
+++ b/packages/blocks/src/blocks/core-file.tsx
@@ -17,7 +17,7 @@ const FALLBACK_ARIA_LABEL = 'PDF embed';
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element|null} The rendered block.
  */
 const CoreFile: CoreFileType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-freeform.tsx b/packages/blocks/src/blocks/core-freeform.tsx
index 1e65b219..b20367c6 100644
--- a/packages/blocks/src/blocks/core-freeform.tsx
+++ b/packages/blocks/src/blocks/core-freeform.tsx
@@ -11,7 +11,7 @@ import type {
  * @param props - The props for the block component.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element|null} The rendered block.
  */
 const CoreFreeform: CoreFreeformType = ( {
 	renderedHtml,
diff --git a/packages/blocks/src/blocks/core-gallery.tsx b/packages/blocks/src/blocks/core-gallery.tsx
index c95f12aa..4b10bd85 100644
--- a/packages/blocks/src/blocks/core-gallery.tsx
+++ b/packages/blocks/src/blocks/core-gallery.tsx
@@ -17,7 +17,7 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreGallery: CoreGalleryType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-group.tsx b/packages/blocks/src/blocks/core-group.tsx
index efe66bc9..bd2b2ec9 100644
--- a/packages/blocks/src/blocks/core-group.tsx
+++ b/packages/blocks/src/blocks/core-group.tsx
@@ -19,7 +19,7 @@ import type {
  * @param props.style - Inline styles.
  * @param props.children - The content to render inside the element.
  *
- * @return The rendered HTML element or the children if no tag name is provided.
+ * @return {React.JSX.Element} The rendered HTML element or the children if no tag name is provided.
  */
 const Tag = ( { name, className, style, children }: TagProps ) => {
 	if ( ! name ) {
@@ -37,7 +37,7 @@ const Tag = ( { name, className, style, children }: TagProps ) => {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreGroup: CoreGroupType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-heading.tsx b/packages/blocks/src/blocks/core-heading.tsx
index 9c77fe26..042f86ee 100644
--- a/packages/blocks/src/blocks/core-heading.tsx
+++ b/packages/blocks/src/blocks/core-heading.tsx
@@ -12,7 +12,7 @@ import type {
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreHeading: CoreHeadingType = ( { attributes }: CoreHeadingProps ) => {
 	const { style, cssClassName, content, level } = attributes || {};
diff --git a/packages/blocks/src/blocks/core-html.tsx b/packages/blocks/src/blocks/core-html.tsx
index 8f4b0172..8ec2aee7 100644
--- a/packages/blocks/src/blocks/core-html.tsx
+++ b/packages/blocks/src/blocks/core-html.tsx
@@ -8,7 +8,7 @@ import type { CoreHtml as CoreHtmlType, CoreHtmlProps } from '@snapwp/types';
  * @param props - The props for the block component.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element|null} The rendered block.
  */
 const CoreHtml: CoreHtmlType = ( { renderedHtml }: CoreHtmlProps ) => {
 	// @todo use attributes.content instead of renderedHtml once it's available
diff --git a/packages/blocks/src/blocks/core-image.tsx b/packages/blocks/src/blocks/core-image.tsx
index d25de732..37bab85d 100644
--- a/packages/blocks/src/blocks/core-image.tsx
+++ b/packages/blocks/src/blocks/core-image.tsx
@@ -28,7 +28,7 @@ import type {
  * @param [props.rel] - The rel for the link.
  * @param [props.lightbox] - The lightbox attribute.
  *
- * @return The rendered figure element.
+ * @return {React.JSX.Element} The rendered figure element.
  */
 const Figure = ( {
 	children,
@@ -77,7 +77,8 @@ const Figure = ( {
  * @param [props.connectedMediaItem] - The connected media item.
  * @param [props.mediaDetails] - The media details.
  * @param [props.renderedHtml] - The rendered HTML.
- * @return The rendered core image block or null if no URL is provided.
+ *
+ * @return {React.JSX.Element|null} The rendered core image block or null if no URL is provided.
  */
 const CoreImage: CoreImageType = ( {
 	attributes,
@@ -170,7 +171,7 @@ const CoreImage: CoreImageType = ( {
  * @param [connectedMediaItem] The connected media item.
  * @param [mediaDetails] The media details.
  *
- * @return The props for the image component.
+ * @return {Object} The props for the image component.
  */
 const getImageProps = (
 	attributes?: CoreImageAttributes,
@@ -244,7 +245,7 @@ const getImageProps = (
  *
  * @param lightbox - The lightbox attribute.
  *
- * @return Whether the lightbox is enabled.
+ * @return {boolean} Whether the lightbox is enabled.
  */
 //@ts-ignore -- Stubbed until lightbox support is fixed.
 const isLightboxEnabled = ( lightbox?: string | null ) => {
@@ -265,7 +266,7 @@ const isLightboxEnabled = ( lightbox?: string | null ) => {
  * @param element - The element to extract attributes for.
  * @param renderedHtml - The rendered HTML.
  *
- * @return The extracted interactivity attributes.
+ * @return {Object} The extracted interactivity attributes.
  */
 const extractInteractivityAttributesForElement = (
 	element: string,
@@ -305,7 +306,7 @@ const extractInteractivityAttributesForElement = (
  * @param element - The element to extract attributes for.
  * @param renderedHtml - The rendered HTML.
  *
- * @return The extracted ARIA attributes.
+ * @return {Object} The extracted ARIA attributes.
  */
 const extractAriaAttributesForElement = (
 	element: string,
diff --git a/packages/blocks/src/blocks/core-list-item.tsx b/packages/blocks/src/blocks/core-list-item.tsx
index 599c4f4d..b8bd2a0a 100644
--- a/packages/blocks/src/blocks/core-list-item.tsx
+++ b/packages/blocks/src/blocks/core-list-item.tsx
@@ -18,7 +18,7 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreListItem: CoreListItemType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-list.tsx b/packages/blocks/src/blocks/core-list.tsx
index 65860aab..0811af09 100644
--- a/packages/blocks/src/blocks/core-list.tsx
+++ b/packages/blocks/src/blocks/core-list.tsx
@@ -9,7 +9,7 @@ import type { CoreList as CoreListType, CoreListProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreList: CoreListType = ( { attributes, children }: CoreListProps ) => {
 	const { cssClassName, ordered, reversed, start, style, type } =
diff --git a/packages/blocks/src/blocks/core-media-text.tsx b/packages/blocks/src/blocks/core-media-text.tsx
index 53fed709..cb23a8c3 100644
--- a/packages/blocks/src/blocks/core-media-text.tsx
+++ b/packages/blocks/src/blocks/core-media-text.tsx
@@ -28,7 +28,8 @@ const DEFAULT_MEDIA_SIZE_SLUG = 'full';
  * @param focalPoint - The focal point of the image.
  * @param focalPoint.x - The x-coordinate of the focal point (0 to 1).
  * @param focalPoint.y - The y-coordinate of the focal point (0 to 1).
- * @return CSS styles for the image fill.
+ *
+ * @return {Object} CSS styles for the image fill.
  */
 function imageFillStyles( url?: string, focalPoint?: FocalPoint ) {
 	return url
@@ -51,7 +52,8 @@ function imageFillStyles( url?: string, focalPoint?: FocalPoint ) {
  * @param props.renderedHtml - Raw HTML string from WordPress
  * @param props.connectedMediaItem - Connected media item
  * @param props.mediaDetails - Media details
- * @return Rendered component or null if no content
+ *
+ * @return {React.JSX.Element} Rendered component or null if no content
  */
 const CoreMediaText: CoreMediaTextType = ( {
 	attributes = {},
diff --git a/packages/blocks/src/blocks/core-paragraph.tsx b/packages/blocks/src/blocks/core-paragraph.tsx
index d9a01bf2..07aae210 100644
--- a/packages/blocks/src/blocks/core-paragraph.tsx
+++ b/packages/blocks/src/blocks/core-paragraph.tsx
@@ -12,7 +12,7 @@ import type {
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreParagraph: CoreParagraphType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-pattern.tsx b/packages/blocks/src/blocks/core-pattern.tsx
index 1539092a..ea6afd57 100644
--- a/packages/blocks/src/blocks/core-pattern.tsx
+++ b/packages/blocks/src/blocks/core-pattern.tsx
@@ -10,7 +10,7 @@ import type {
  * @param props - The props for the block component.
  * @param props.children - The block's children.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CorePattern: CorePatternType = ( { children }: CorePatternProps ) => {
 	// Patterns contain only children, so we just return them.
diff --git a/packages/blocks/src/blocks/core-post-content.tsx b/packages/blocks/src/blocks/core-post-content.tsx
index fb9bce63..fbda6b24 100644
--- a/packages/blocks/src/blocks/core-post-content.tsx
+++ b/packages/blocks/src/blocks/core-post-content.tsx
@@ -12,7 +12,7 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CorePostContent: CorePostContentType = ( {
 	renderedHtml,
diff --git a/packages/blocks/src/blocks/core-preformatted.tsx b/packages/blocks/src/blocks/core-preformatted.tsx
index 61ecfe6c..efdd7902 100644
--- a/packages/blocks/src/blocks/core-preformatted.tsx
+++ b/packages/blocks/src/blocks/core-preformatted.tsx
@@ -17,7 +17,7 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CorePreformatted: CorePreformattedType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-pullquote.tsx b/packages/blocks/src/blocks/core-pullquote.tsx
index 14a77bc1..3533b646 100644
--- a/packages/blocks/src/blocks/core-pullquote.tsx
+++ b/packages/blocks/src/blocks/core-pullquote.tsx
@@ -17,7 +17,7 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CorePullquote: CorePullquoteType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-quote.tsx b/packages/blocks/src/blocks/core-quote.tsx
index b0fec182..6c69f0e8 100644
--- a/packages/blocks/src/blocks/core-quote.tsx
+++ b/packages/blocks/src/blocks/core-quote.tsx
@@ -10,7 +10,7 @@ import type { CoreQuote as CoreQuoteType, CoreQuoteProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreQuote: CoreQuoteType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-separator.tsx b/packages/blocks/src/blocks/core-separator.tsx
index 32664d98..302ac03c 100644
--- a/packages/blocks/src/blocks/core-separator.tsx
+++ b/packages/blocks/src/blocks/core-separator.tsx
@@ -11,7 +11,7 @@ import type {
  * @param props - The props for the block component.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreSeparator: CoreSeparatorType = ( {
 	renderedHtml,
diff --git a/packages/blocks/src/blocks/core-spacer.tsx b/packages/blocks/src/blocks/core-spacer.tsx
index cd5ddc36..515d7c10 100644
--- a/packages/blocks/src/blocks/core-spacer.tsx
+++ b/packages/blocks/src/blocks/core-spacer.tsx
@@ -17,7 +17,7 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreSpacer: CoreSpacerType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-template-part.tsx b/packages/blocks/src/blocks/core-template-part.tsx
index f74415b1..068ea1f8 100644
--- a/packages/blocks/src/blocks/core-template-part.tsx
+++ b/packages/blocks/src/blocks/core-template-part.tsx
@@ -13,7 +13,7 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreTemplatePart: CoreTemplatePartType = ( {
 	renderedHtml,
diff --git a/packages/blocks/src/blocks/core-verse.tsx b/packages/blocks/src/blocks/core-verse.tsx
index cd650ee2..0bcc90d0 100644
--- a/packages/blocks/src/blocks/core-verse.tsx
+++ b/packages/blocks/src/blocks/core-verse.tsx
@@ -14,7 +14,7 @@ import type { CoreVerse as CoreVerseType, CoreVerseProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element} The rendered block.
  */
 const CoreVerse: CoreVerseType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-video.tsx b/packages/blocks/src/blocks/core-video.tsx
index 87114c2c..3d5f175a 100644
--- a/packages/blocks/src/blocks/core-video.tsx
+++ b/packages/blocks/src/blocks/core-video.tsx
@@ -17,7 +17,7 @@ import type {
  * @param props - The props for the component.
  * @param props.tracks - An array of track objects containing `src`, `kind`, `srclang`, and `label`.
  *
- * @return A list of `<track>` elements or `null` if no tracks are provided.
+ * @return {React.JSX.Element|null} A list of `<track>` elements or `null` if no tracks are provided.
  */
 const Tracks = ( { tracks }: { tracks?: TrackProps[] } ) => {
 	if ( ! tracks || tracks.length === 0 ) {
@@ -45,7 +45,7 @@ const Tracks = ( { tracks }: { tracks?: TrackProps[] } ) => {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return The rendered block.
+ * @return {React.JSX.Element|null} The rendered block.
  */
 const CoreVideo: CoreVideoType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/default.tsx b/packages/blocks/src/blocks/default.tsx
index 370ea008..bb3706d5 100644
--- a/packages/blocks/src/blocks/default.tsx
+++ b/packages/blocks/src/blocks/default.tsx
@@ -6,7 +6,8 @@ import type { Default as DefaultType, DefaultProps } from '@snapwp/types';
  * Renders the default block.
  * @param props - The props for the component.
  * @param props.renderedHtml - The rendered HTML.
- * @return The rendered default block.
+ *
+ * @return {React.JSX.Element|null} The rendered default block.
  */
 const Default: DefaultType = ( { renderedHtml }: DefaultProps ) => {
 	if ( ! renderedHtml ) {
diff --git a/packages/blocks/src/editor-blocks-renderer/index.tsx b/packages/blocks/src/editor-blocks-renderer/index.tsx
index 780d91c8..92c7c0a7 100644
--- a/packages/blocks/src/editor-blocks-renderer/index.tsx
+++ b/packages/blocks/src/editor-blocks-renderer/index.tsx
@@ -14,7 +14,8 @@ type EditorBlocksRendererProps = {
  * @param props - Props.
  * @param props.editorBlocks - A list of blocks to be rendered.
  * @param props.blockDefinitions - Blocks rendering functions.
- * @return The rendered template
+ *
+ * @return {React.JSX.Element} The rendered template.
  */
 export default function EditorBlocksRenderer( {
 	editorBlocks,
diff --git a/packages/blocks/src/utils/flat-list-to-hierarchical.ts b/packages/blocks/src/utils/flat-list-to-hierarchical.ts
index 814e897c..d0187333 100644
--- a/packages/blocks/src/utils/flat-list-to-hierarchical.ts
+++ b/packages/blocks/src/utils/flat-list-to-hierarchical.ts
@@ -14,7 +14,8 @@ type Data = Record< string | number, unknown >;
  * @param options.idKey The key for the unique identifier.
  * @param options.parentKey The key for the parent identifier.
  * @param options.childrenKey The key for the children.
- * @return Data Array
+ *
+ * @return {Array<Data>} Data Array
  */
 export default function flatListToHierarchical(
 	data: Data[] = [],
diff --git a/packages/core/src/config/snapwp-config-manager.ts b/packages/core/src/config/snapwp-config-manager.ts
index 27c80905..38c00546 100644
--- a/packages/core/src/config/snapwp-config-manager.ts
+++ b/packages/core/src/config/snapwp-config-manager.ts
@@ -76,7 +76,7 @@ const defaultConfig: Partial< SnapWPEnv & SnapWPConfig > = {
  *
  * This is a function (instead of a constant) so we can inject the variables in Jest.
  *
- * @return The configuration object.
+ * @return {Partial<SnapWPEnv>} The configuration object.
  */
 const envConfig = (): Partial< SnapWPEnv > => ( {
 	/* eslint-disable n/no-process-env -- These are the env variables we want to manage. */
@@ -220,7 +220,8 @@ class SnapWPConfigManager {
 	 * Normalizes the configuration.
 	 *
 	 * @param cfg The configuration to normalize.
-	 * @return The normalized configuration.
+	 *
+	 * @return {Partial<Type>} The normalized configuration.
 	 */
 	static normalizeConfig = < T >( cfg: Partial< T > ) => {
 		// Removing empty values.
@@ -249,7 +250,7 @@ class SnapWPConfigManager {
 	/**
 	 * Get the configuration.
 	 *
-	 * @return The resolved configuration.
+	 * @return {SnapWPConfig|SnapWPEnv} The resolved configuration.
 	 */
 	static getConfig(): Readonly< SnapWPConfig & SnapWPEnv > {
 		if ( ! SnapWPConfigManager.configsSet ) {
@@ -304,7 +305,8 @@ class SnapWPConfigManager {
 	 * @param config The configuration to validate.
 	 * @param schema The schema to validate the configuration against.
 	 *
-	 * @return The resolved configuration.
+	 * @return {Partial<Type>} The resolved configuration.
+	 *
 	 * @throws {Error} If the configuration is invalid.
 	 */
 	static validateConfig = < T >(
@@ -364,7 +366,7 @@ class SnapWPConfigManager {
 	/**
 	 * Get the GraphQL URL.
 	 *
-	 * @return The GraphQL URL.
+	 * @return {string} The GraphQL URL.
 	 */
 	static getGraphqlUrl(): string {
 		return generateGraphqlUrl(
diff --git a/packages/core/src/config/tests/snapwp-config-manager.test.tsx b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
index 9f45a1be..73c3b4cb 100644
--- a/packages/core/src/config/tests/snapwp-config-manager.test.tsx
+++ b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 /**
  * A mock React component used for testing block definitions.
  *
- * @return A div containing "Test Block".
+ * @return {React.JSX.Element} A div containing "Test Block".
  */
 const MockBlockComponent = () => <div>Test Block</div>;
 
diff --git a/packages/core/src/logger/index.ts b/packages/core/src/logger/index.ts
index 70848be3..2ded22b9 100644
--- a/packages/core/src/logger/index.ts
+++ b/packages/core/src/logger/index.ts
@@ -60,7 +60,7 @@ class Logger {
 	 *
 	 * @example Logger.debug("This is a debug message.")
 	 *
-	 * @return void
+	 * @return {void}
 	 */
 	static debug = ( ...args: any[] ): void => log( LOGTYPE.DEBUG, ...args );
 
@@ -71,7 +71,7 @@ class Logger {
 	 *
 	 * @example Logger.info("This is an info message.")
 	 *
-	 * @return void
+	 * @return {void}
 	 */
 	static info = ( ...args: any[] ): void => log( LOGTYPE.INFO, ...args );
 
@@ -82,7 +82,7 @@ class Logger {
 	 *
 	 * @example Logger.warn("You should do/change something.")
 	 *
-	 * @return void
+	 * @return {void}
 	 */
 	static warn = ( ...args: any[] ): void => log( LOGTYPE.WARN, ...args );
 
@@ -93,7 +93,7 @@ class Logger {
 	 *
 	 * @example Logger.error("An error occurred.")
 	 *
-	 * @return void
+	 * @return {void}
 	 */
 	static error = ( ...args: any[] ): void => log( LOGTYPE.ERROR, ...args );
 
@@ -104,7 +104,7 @@ class Logger {
 	 *
 	 * @example Logger.log("This is a message.")
 	 *
-	 * @return void
+	 * @return {void}
 	 */
 	static log = ( ...args: any[] ): void => log( LOGTYPE.LOG, ...args );
 }
diff --git a/packages/core/src/utils/cn.ts b/packages/core/src/utils/cn.ts
index 1fb34a01..d2eefb19 100644
--- a/packages/core/src/utils/cn.ts
+++ b/packages/core/src/utils/cn.ts
@@ -4,7 +4,8 @@ import { type ClassValue, clsx } from 'clsx';
  * Combines class names.
  *
  * @param  inputs - Class names or objects to combine.
- * @return Joined class names.
+ *
+ * @return {string} Joined class names.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/find-element-and-get-class-names.ts b/packages/core/src/utils/find-element-and-get-class-names.ts
index 6f21f1fb..bcd317cf 100644
--- a/packages/core/src/utils/find-element-and-get-class-names.ts
+++ b/packages/core/src/utils/find-element-and-get-class-names.ts
@@ -6,7 +6,7 @@ import { getClassNamesFromString, cn } from '@/utils';
  * @param renderedHtml - The rendered HTML string.
  * @param elementSelector - The element selector (class, id, or tag name) If selector is not provided then it will select the first element and will return it's classNames.
  *
- * @return The extracted class names from the first occurrence of the specified element or an empty string if the element is not found.
+ * @return {string} The extracted class names from the first occurrence of the specified element or an empty string if the element is not found.
  */
 export default function findElementAndGetClassNames(
 	renderedHtml?: string | null,
diff --git a/packages/core/src/utils/generate-graphql-url.ts b/packages/core/src/utils/generate-graphql-url.ts
index 07c45d24..a06da885 100644
--- a/packages/core/src/utils/generate-graphql-url.ts
+++ b/packages/core/src/utils/generate-graphql-url.ts
@@ -6,7 +6,7 @@ import { Logger } from '@/logger';
  * @param homeUrl The home URL.
  * @param graphqlEndpoint The GraphQL endpoint.
  *
- * @return The complete GraphQL URL.
+ * @return {string} The complete GraphQL URL.
  */
 export default function generateGraphqlUrl(
 	homeUrl?: string,
diff --git a/packages/core/src/utils/get-class-names-from-string.ts b/packages/core/src/utils/get-class-names-from-string.ts
index f2a5f4f7..1a028bac 100644
--- a/packages/core/src/utils/get-class-names-from-string.ts
+++ b/packages/core/src/utils/get-class-names-from-string.ts
@@ -2,7 +2,8 @@
  * Extracts class names from the `class` attribute in an HTML string.
  *
  * @param html - The HTML string to parse.
- * @return An array of class names.
+ *
+ * @return {Array<string>} An array of class names.
  */
 export default function getClassNamesFromString( html: string ): string[] {
 	// Match the first occurrence of the class attribute
diff --git a/packages/core/src/utils/get-color-class-name.ts b/packages/core/src/utils/get-color-class-name.ts
index 687bdea4..724f8299 100644
--- a/packages/core/src/utils/get-color-class-name.ts
+++ b/packages/core/src/utils/get-color-class-name.ts
@@ -3,7 +3,8 @@
  *
  * @param colorContextName - The context name for the color (e.g., 'background', 'text').
  * @param colorSlug - The slug for the color (e.g., 'primary', 'secondary').
- * @return The generated CSS class name or undefined if parameters are missing.
+ *
+ * @return {string|undefined} The generated CSS class name or undefined if parameters are missing.
  */
 export default function getColorClassName(
 	colorContextName?: string,
diff --git a/packages/core/src/utils/get-image-size-from-attributes.ts b/packages/core/src/utils/get-image-size-from-attributes.ts
index 541ee96f..5bfb6080 100644
--- a/packages/core/src/utils/get-image-size-from-attributes.ts
+++ b/packages/core/src/utils/get-image-size-from-attributes.ts
@@ -30,7 +30,8 @@ const imageSizeToHeight: {
  * Retrieves the width and height based on image attributes.
  *
  * @param attributes - Image size attributes including sizeSlug, width, and height.
- * @return An object containing the width and height in pixels.
+ *
+ * @return {Object} An object containing the width and height in pixels.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/get-px-for-size-attribute.ts b/packages/core/src/utils/get-px-for-size-attribute.ts
index 0b64d668..270c91ff 100644
--- a/packages/core/src/utils/get-px-for-size-attribute.ts
+++ b/packages/core/src/utils/get-px-for-size-attribute.ts
@@ -2,7 +2,8 @@
  * Converts a size attribute to pixels.
  *
  * @param sizeAttribute - The size attribute string (e.g., "10em", "50%").
- * @return The size in pixels.
+ *
+ * @return {number} The size in pixels.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/get-spacing-preset-css-var.ts b/packages/core/src/utils/get-spacing-preset-css-var.ts
index a57132d3..c02031d5 100644
--- a/packages/core/src/utils/get-spacing-preset-css-var.ts
+++ b/packages/core/src/utils/get-spacing-preset-css-var.ts
@@ -5,7 +5,7 @@
  *
  * @param value Value to convert.
  *
- * @return  CSS var string for given spacing preset value.
+ * @return {string|undefined} CSS var string for given spacing preset value.
  */
 export default function getSpacingPresetCssVar(
 	value: string | null | undefined
diff --git a/packages/core/src/utils/get-style-object-from-string.ts b/packages/core/src/utils/get-style-object-from-string.ts
index 4978bf4d..881e3bba 100644
--- a/packages/core/src/utils/get-style-object-from-string.ts
+++ b/packages/core/src/utils/get-style-object-from-string.ts
@@ -5,7 +5,8 @@ import { Logger } from '@/logger';
  * Formats a string to camel case.
  *
  * @param str - The input string.
- * @return The camelcased string.
+ *
+ * @return {string} The camelcased string.
  *
  * @internal
  */
@@ -31,7 +32,8 @@ function formatStringToCamelCase( str: string ): string {
  * Converts a CSS string to an object.
  *
  * @param str - The CSS string.
- * @return The style object.
+ *
+ * @return {CSSProperties} The style object.
  */
 function cssToReactStyle( str: string ): CSSProperties {
 	const style: { [ key: string ]: string } = {}; // add index signature here
@@ -55,7 +57,8 @@ function cssToReactStyle( str: string ): CSSProperties {
  * Converts a CSS string or object to a React style object.
  *
  * @param css - The CSS string.
- * @return The style object.
+ *
+ * @return {CSSProperties} The style object.
  */
 export default function getStyleObjectFromString(
 	css: object | string
diff --git a/packages/core/src/utils/get-styles-from-attributes.ts b/packages/core/src/utils/get-styles-from-attributes.ts
index b50d841b..928cec0c 100644
--- a/packages/core/src/utils/get-styles-from-attributes.ts
+++ b/packages/core/src/utils/get-styles-from-attributes.ts
@@ -9,7 +9,8 @@ interface AttributesWithStyle {
  * Extracts and compiles styles from attributes.
  *
  * @param attributes - Object containing a style string.
- * @return Compiled styles as an object or an empty object if no styles exist.
+ *
+ * @return {CSSProperties} Compiled styles as an object or an empty object if no styles exist.
  */
 export default function getStylesFromAttributes(
 	attributes: AttributesWithStyle
diff --git a/packages/core/src/utils/is-valid-url.ts b/packages/core/src/utils/is-valid-url.ts
index 1bb163d7..94114058 100644
--- a/packages/core/src/utils/is-valid-url.ts
+++ b/packages/core/src/utils/is-valid-url.ts
@@ -1,6 +1,7 @@
 /**
  * @param str A string to be validated as a Url.
- * @return flag signifying validity.
+ *
+ * @return {boolean} flag signifying validity.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/parse-external-remote-patterns.ts b/packages/core/src/utils/parse-external-remote-patterns.ts
index f1f8b3b0..3e2f834a 100644
--- a/packages/core/src/utils/parse-external-remote-patterns.ts
+++ b/packages/core/src/utils/parse-external-remote-patterns.ts
@@ -1,7 +1,8 @@
 /**
  * Parses given string into remote patterns.
  * @param str URLs for external image sources in a comma seperated fashion.
- * @return an array of remote patterns to be used in next.config.js
+ *
+ * @return {Array<Object>} an array of remote patterns to be used in next.config.js
  *
  * @internal
  */
diff --git a/packages/core/src/utils/replace-host-url.ts b/packages/core/src/utils/replace-host-url.ts
index 61aa1c0d..d8bc0ce6 100644
--- a/packages/core/src/utils/replace-host-url.ts
+++ b/packages/core/src/utils/replace-host-url.ts
@@ -4,7 +4,8 @@
  * @param url - WP url.
  * @param hostUrl - Host url to be replaced.
  * @param newHostUrl - Host url to be replaced with.
- * @return The internal url.
+ *
+ * @return {string} The internal url.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/url-slash-modify.ts b/packages/core/src/utils/url-slash-modify.ts
index c0f6ff07..14d5f6cf 100644
--- a/packages/core/src/utils/url-slash-modify.ts
+++ b/packages/core/src/utils/url-slash-modify.ts
@@ -3,7 +3,7 @@
  *
  * @param url The URL to modify.
  *
- * @return The modified URL.
+ * @return {string} The modified URL.
  *
  * @internal
  */
@@ -16,7 +16,7 @@ export function removeTrailingSlash( url: string ): string {
  *
  * @param url The URL to modify.
  *
- * @return The modified URL.
+ * @return {string} The modified URL.
  *
  * @internal
  */
@@ -29,7 +29,7 @@ export function addTrailingSlash( url: string ): string {
  *
  * @param url The URL to modify.
  *
- * @return The modified URL.
+ * @return {string} The modified URL.
  *
  * @internal
  */
@@ -42,7 +42,7 @@ export function removeLeadingSlash( url: string ): string {
  *
  * @param url The URL to modify.
  *
- * @return The modified URL.
+ * @return {string} The modified URL.
  *
  * @internal
  */
diff --git a/packages/next/src/components/default-error.tsx b/packages/next/src/components/default-error.tsx
index 51133669..63d2fa2c 100644
--- a/packages/next/src/components/default-error.tsx
+++ b/packages/next/src/components/default-error.tsx
@@ -12,7 +12,7 @@ import React from 'react';
  * @param root0.error - The error.
  * @param root0.reset - The reset function.
  *
- * @return The default error component.
+ * @return {React.JSX.Element} The default error component.
  */
 export default function DefaultError( {
 	error,
diff --git a/packages/next/src/components/font.tsx b/packages/next/src/components/font.tsx
index 45144d31..939880c1 100644
--- a/packages/next/src/components/font.tsx
+++ b/packages/next/src/components/font.tsx
@@ -5,7 +5,8 @@ import React from 'react';
  *
  * @param props - Props for the Font component.
  * @param props.renderedFontFaces - Font face data as a string.
- * @return A style tag with the rendered font faces.
+ *
+ * @return {React.JSX.Element} A style tag with the rendered font faces.
  *
  * @todo Implement next/font once a solution for handling literal types is determined.
  */
diff --git a/packages/next/src/components/image.tsx b/packages/next/src/components/image.tsx
index d32c8deb..e5ec891c 100644
--- a/packages/next/src/components/image.tsx
+++ b/packages/next/src/components/image.tsx
@@ -46,7 +46,7 @@ interface ImageInterface {
  * @param props.fill - If true, fills the container.
  * @param props.src - Source URL for the image.
  *
- * @return The rendered image.
+ * @return {React.JSX.Element|null} The rendered image.
  */
 export default function Image( {
 	alt,
diff --git a/packages/next/src/components/link.tsx b/packages/next/src/components/link.tsx
index ce13528e..fab86ec6 100644
--- a/packages/next/src/components/link.tsx
+++ b/packages/next/src/components/link.tsx
@@ -22,7 +22,7 @@ interface LinkInterface {
  * @param props.className - CSS class name.
  * @param props.children - Block's Children.
  *
- * @return The rendered link.
+ * @return {React.JSX.Element} The rendered link.
  */
 export default function Link( {
 	href,
diff --git a/packages/next/src/components/script-module.tsx b/packages/next/src/components/script-module.tsx
index 43908558..f4b44ffc 100644
--- a/packages/next/src/components/script-module.tsx
+++ b/packages/next/src/components/script-module.tsx
@@ -32,7 +32,8 @@ interface ScriptModuleInterface {
  * @param props.src - The source URL for the script module
  * @param props.extraData - Additional data required by the script module
  * @param props.dependencies - Dependencies required by the script module
- * @return The rendered script module elements
+ *
+ * @return {React.JSX.Element} The rendered script module elements
  */
 export default function ScriptModule( {
 	handle,
diff --git a/packages/next/src/components/script.tsx b/packages/next/src/components/script.tsx
index 35045497..ffa9e9a4 100644
--- a/packages/next/src/components/script.tsx
+++ b/packages/next/src/components/script.tsx
@@ -22,7 +22,8 @@ interface ScriptInterface {
  * @param props.loadingStrategy - The loading strategy for the script (async or defer).
  * @param props.groupLocation - The location where the script should be loaded.
  * @param props.src - The source URL for the script.
- * @return The rendered script element.
+ *
+ * @return {React.JSX.Element} The rendered script element.
  */
 export default function Script( {
 	after,
diff --git a/packages/next/src/config/with-snap-wp.ts b/packages/next/src/config/with-snap-wp.ts
index bc9ae9dc..e89330ab 100644
--- a/packages/next/src/config/with-snap-wp.ts
+++ b/packages/next/src/config/with-snap-wp.ts
@@ -13,7 +13,8 @@ import {
  * TODO: Explore a better approach to support Turbopack.
  *
  * @param snapWPConfigPath The path to the SnapWP configuration file.
- * @return A function that modifies the webpack configuration.
+ *
+ * @return {(config: any) => any} A function that modifies the webpack configuration.
  */
 const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 	/**
@@ -21,7 +22,8 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 	 *
 	 * @param config The webpack configuration. Using `any` type as the parameter type is `any` in Next.js.
 	 * @see node_modules/next/dist/server/config-shared.js:169
-	 * @return The modified webpack configuration.
+	 *
+	 * @return {any} The modified webpack configuration.
 	 */
 	return ( config: any ) => {
 		const configPath = `
@@ -36,7 +38,8 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 						 * Tests whether the module should be modified.
 						 *
 						 * @param normalModule The normal module being processed.
-						 * @return `true` if the module should be modified, otherwise `false`.
+						 *
+						 * @return {boolean} `true` if the module should be modified, otherwise `false`.
 						 */
 						test: ( normalModule ) => {
 							const userRequest = normalModule.userRequest || '';
@@ -74,7 +77,8 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
  * Extends the Next.js configuration with SnapWP configuration.
  *
  * @param nextConfig The Next.js configuration object.
- * @return The extended configuration object.
+ *
+ * @return {Promise<NextConfig>} The extended configuration object.
  */
 const withSnapWP = async ( nextConfig?: NextConfig ): Promise< NextConfig > => {
 	const possibleSnapWPConfigPaths = [
diff --git a/packages/next/src/middleware/cors.ts b/packages/next/src/middleware/cors.ts
index 30e0dbdd..c62ef528 100644
--- a/packages/next/src/middleware/cors.ts
+++ b/packages/next/src/middleware/cors.ts
@@ -16,7 +16,8 @@ import { Logger } from '@snapwp/core';
  * assuming env vars NEXT_PUBLIC_URL had its value set to http://localhost:3000 and NEXT_PUBLIC_WORDPRESS_URL to https://examplewp.com
  *
  * @param  next - Next middleware
- * @return The response object with modified headers
+ *
+ * @return {(request:NextRequest, _next:NextFetchEvent) => Promise<Response|void|undefined|null>} The response object with modified headers.
  */
 export const corsProxyMiddleware: MiddlewareFactory = (
 	next: NextMiddleware
@@ -56,8 +57,8 @@ export const corsProxyMiddleware: MiddlewareFactory = (
 					'Content-Security-Policy': "default-src 'self'",
 				},
 			} );
-		} catch ( error ) {
-			Logger.error( 'Proxy error:', error );
+		} catch ( error: unknown ) {
+			Logger.error( 'Proxy error:', error as Error );
 			return NextResponse.json(
 				{ error: 'Internal Server Error' },
 				{ status: 500 }
diff --git a/packages/next/src/middleware/current-path.ts b/packages/next/src/middleware/current-path.ts
index 3b3a0179..f5c660ea 100644
--- a/packages/next/src/middleware/current-path.ts
+++ b/packages/next/src/middleware/current-path.ts
@@ -8,7 +8,8 @@ import type { MiddlewareFactory } from './utils';
  * which contains the current pathname of the request.
  *
  * @param  next - Next middleware
- * @return The response object with modified headers
+ *
+ * @return {(request:NextRequest, _next:NextFetchEvent) => Promise<Response|void|undefined|null>} The response object with modified headers
  */
 export const currentPath: MiddlewareFactory = ( next: NextMiddleware ) => {
 	return async ( request: NextRequest, _next: NextFetchEvent ) => {
diff --git a/packages/next/src/middleware/proxies.ts b/packages/next/src/middleware/proxies.ts
index 501b4234..677a746b 100644
--- a/packages/next/src/middleware/proxies.ts
+++ b/packages/next/src/middleware/proxies.ts
@@ -14,7 +14,8 @@ import type { MiddlewareFactory } from './utils';
  * This middleware adds custom proxies.
  *
  * @param  next - Next middleware
- * @return Custom redirection or NextMiddleware.
+ *
+ * @return {(request:NextRequest, _next:NextFetchEvent) => Promise<Response|void|undefined|null>} Custom redirection or NextMiddleware.
  */
 export const proxies: MiddlewareFactory = ( next: NextMiddleware ) => {
 	return async ( request: NextRequest, _next: NextFetchEvent ) => {
diff --git a/packages/next/src/middleware/utils.ts b/packages/next/src/middleware/utils.ts
index 6695e7a1..ff99a529 100644
--- a/packages/next/src/middleware/utils.ts
+++ b/packages/next/src/middleware/utils.ts
@@ -17,7 +17,7 @@ export type MiddlewareFactory = (
  * @param stackDefaultMiddlewares Weather to add load default middlewares with custom ones.
  *                                Pass false to skip loading default middlewares.
  *
- * @return NextMiddleware
+ * @return {NextMiddleware} NextJS Middleware.
  */
 export function appMiddlewares(
 	functions: MiddlewareFactory[] = [],
@@ -45,7 +45,7 @@ export function appMiddlewares(
  *
  * @param middlewares Array containing user defined Middlewares.
  *
- * @return Array combining default middlewares and custom middlewares.
+ * @return {Array<MiddlewareFactory>} Array combining default middlewares and custom middlewares.
  */
 export function stackMiddlewares( middlewares: MiddlewareFactory[] = [] ) {
 	const { useCorsProxy } = getConfig();
diff --git a/packages/next/src/react-parser/index.tsx b/packages/next/src/react-parser/index.tsx
index b473a7f9..13911b6e 100644
--- a/packages/next/src/react-parser/index.tsx
+++ b/packages/next/src/react-parser/index.tsx
@@ -8,7 +8,8 @@ import type { HTMLReactParserOptions } from 'html-react-parser';
  *
  * @param props - The props for the parser.
  * @param props.html - The HTML string to parse and render.
- * @return The rendered React components.
+ *
+ * @return {React.JSX.Element} The rendered React components.
  */
 export default function Parse( { html }: { html: string } ) {
 	const {
diff --git a/packages/next/src/react-parser/options.tsx b/packages/next/src/react-parser/options.tsx
index 8714eedc..4cbbe81f 100644
--- a/packages/next/src/react-parser/options.tsx
+++ b/packages/next/src/react-parser/options.tsx
@@ -17,7 +17,8 @@ export const defaultOptions: HTMLReactParserOptions = {
 	 * Replaces anchor tags with Next.js Link components.
 	 *
 	 * @param domNode - The DOM node being processed.
-	 * @return A React element if the node is an anchor tag, otherwise undefined.
+	 *
+	 * @return {React.JSX.Element|undefined} A React element if the node is an anchor tag, otherwise undefined.
 	 */
 	replace: ( domNode ) => {
 		if ( domNode instanceof Element ) {
diff --git a/packages/next/src/root-layout/global-head.tsx b/packages/next/src/root-layout/global-head.tsx
index 6858792c..8e42afd0 100644
--- a/packages/next/src/root-layout/global-head.tsx
+++ b/packages/next/src/root-layout/global-head.tsx
@@ -10,7 +10,8 @@ import { type GlobalHeadProps } from '@snapwp/core';
  * @param props.customCss - Custom CSS to be included.
  * @param props.globalStylesheet - Global stylesheet for the page.
  * @param props.renderedFontFaces - Font faces rendered locally.
- * @return A head element containing the provided styles and links.
+ *
+ * @return {React.JSX.Element} A head element containing the provided styles and links.
  */
 export function GlobalHead( {
 	customCss,
diff --git a/packages/next/src/root-layout/index.tsx b/packages/next/src/root-layout/index.tsx
index dfb3f176..bf0c5c9e 100644
--- a/packages/next/src/root-layout/index.tsx
+++ b/packages/next/src/root-layout/index.tsx
@@ -12,7 +12,7 @@ export type RootLayoutProps = {
  * @param props.getGlobalStyles - A async callback to get global styles.
  * @param props.children - Child components.
  *
- * @return The rendered template
+ * @return {React.JSX.Element} The rendered template.
  */
 export async function RootLayout( {
 	getGlobalStyles = QueryEngine.getGlobalStyles,
diff --git a/packages/next/src/template-renderer/index.tsx b/packages/next/src/template-renderer/index.tsx
index cb671583..bef14fed 100644
--- a/packages/next/src/template-renderer/index.tsx
+++ b/packages/next/src/template-renderer/index.tsx
@@ -18,7 +18,8 @@ export type TemplateRendererProps = {
  * @param props - The props for the component..
  * @param props.getTemplateData - A async callback to get template styles and content.
  * @param props.children - The block content to render.
- * @return A complete HTML document structure.
+ *
+ * @return {React.JSX.Element} A complete HTML document structure.
  */
 export async function TemplateRenderer( {
 	getTemplateData = QueryEngine.getTemplateData,
diff --git a/packages/next/src/template-renderer/template-head.tsx b/packages/next/src/template-renderer/template-head.tsx
index fa853c7e..fadeb852 100644
--- a/packages/next/src/template-renderer/template-head.tsx
+++ b/packages/next/src/template-renderer/template-head.tsx
@@ -6,7 +6,8 @@ import { type TemplateHeadProps } from '@snapwp/core';
  *
  * @param props - The props for the component.
  * @param props.stylesheets - An array of additional stylesheets and inline styles.
- * @return A head element containing the provided styles and links.
+ *
+ * @return {Array<React.JSX.Element>|null} A head element containing the provided styles and links.
  */
 export function TemplateHead( { stylesheets }: TemplateHeadProps ) {
 	if ( ! stylesheets ) {
diff --git a/packages/next/src/template-renderer/template-scripts.tsx b/packages/next/src/template-renderer/template-scripts.tsx
index c13ef5c7..61fa207a 100644
--- a/packages/next/src/template-renderer/template-scripts.tsx
+++ b/packages/next/src/template-renderer/template-scripts.tsx
@@ -10,7 +10,8 @@ import { getConfig } from '@snapwp/core/config';
  *
  * @param props - The props for the component.
  * @param props.scripts - Array of script objects to be rendered.
- * @return A collection of `<Script />` components.
+ *
+ * @return {React.JSX.Element} A collection of `<Script />` components.
  */
 const ScriptMap = ( { scripts }: { scripts: EnqueuedScriptProps[] } ) => (
 	<>
@@ -31,7 +32,8 @@ const ScriptMap = ( { scripts }: { scripts: EnqueuedScriptProps[] } ) => (
  *
  * @param props - The props for the component.
  * @param props.scriptModules - Array of script module objects to generate import map from.
- * @return A Script component containing the import map if dependencies exist.
+ *
+ * @return {React.JSX.Element|null} A Script component containing the import map if dependencies exist.
  */
 const ImportMap = ( {
 	scriptModules,
@@ -79,7 +81,8 @@ const ImportMap = ( {
  *
  * @param props - The props for the component.
  * @param props.scriptModules - Array of script module objects to be rendered.
- * @return A collection of `<ScriptModule />` components.
+ *
+ * @return {React.JSX.Element} A collection of `<ScriptModule />` components.
  */
 const ScriptModuleMap = ( {
 	scriptModules,
@@ -161,7 +164,8 @@ const ScriptModuleMap = ( {
  * @param props.scripts - Array of script objects to be included in the page.
  * @param props.children - The children elements to be rendered.
  * @param props.scriptModules - Array of script module objects to be included in the page.
- * @return A collection of script elements.
+ *
+ * @return {React.JSX.Element} A collection of script elements.
  */
 export function TemplateScripts( {
 	children,
diff --git a/packages/query/src/query-engine/index.ts b/packages/query/src/query-engine/index.ts
index ce4c5e1e..f743553d 100644
--- a/packages/query/src/query-engine/index.ts
+++ b/packages/query/src/query-engine/index.ts
@@ -44,7 +44,8 @@ export class QueryEngine {
 	/**
 	 * Returns the singleton instance of QueryEngine.
 	 * @throws Throws error if instance is not initialized with config.
-	 * @return The QueryEngine instance.
+	 *
+	 * @return {QueryEngine} The QueryEngine instance.
 	 */
 	public static getInstance(): QueryEngine {
 		if ( ! QueryEngine.instance ) {
@@ -55,7 +56,8 @@ export class QueryEngine {
 
 	/**
 	 * Fetches global styles.
-	 * @return The template data fetched for the uri.
+	 *
+	 * @return {Promise<GlobalHeadProps>} The template data fetched for the uri.
 	 */
 	static getGlobalStyles = async (): Promise< GlobalHeadProps > => {
 		if ( ! QueryEngine.isClientInitialized ) {
@@ -91,7 +93,8 @@ export class QueryEngine {
 	/**
 	 * Fetches blocks, scripts and styles for the given uri.
 	 * @param uri - The URL of the seed node.
-	 * @return The template data fetched for the uri.
+	 *
+	 * @return {object|undefined} The template data fetched for the uri.
 	 */
 	static getTemplateData = async ( uri: string ) => {
 		if ( ! QueryEngine.isClientInitialized ) {
@@ -154,7 +157,7 @@ const logApolloErrors = ( error: ApolloError ) => {
  *
  * @param networkError - The network error.
  *
- * @return The network error message.
+ * @return {string} The network error message.
  */
 const getNetworkErrorMessage = (
 	networkError: Error | ServerParseError | ServerError
diff --git a/packages/query/src/utils/parse-global-styles.ts b/packages/query/src/utils/parse-global-styles.ts
index 9e817831..b467708f 100644
--- a/packages/query/src/utils/parse-global-styles.ts
+++ b/packages/query/src/utils/parse-global-styles.ts
@@ -13,7 +13,7 @@ import type { GetGlobalStylesQuery } from '@graphqlTypes/graphql';
  *
  * @throws Throws an error if the query data is missing or invalid.
  *
- * @return An object containing parsed template data.
+ * @return {GlobalHeadProps} An object containing parsed template data.
  */
 export default function parseQueryResult(
 	queryData: ApolloQueryResult< GetGlobalStylesQuery >
diff --git a/packages/query/src/utils/parse-template.ts b/packages/query/src/utils/parse-template.ts
index d8cbd21b..23cdcee6 100644
--- a/packages/query/src/utils/parse-template.ts
+++ b/packages/query/src/utils/parse-template.ts
@@ -16,7 +16,7 @@ import type { GetCurrentTemplateQuery } from '@graphqlTypes/graphql';
  * @param wordpressUrl - The base URL of the WordPress site.
  * @param uri - The URI of the template.
  *
- * @return An object containing parsed template data.
+ * @return {Object} An object containing parsed template data.
  */
 export default function parseQueryResult(
 	queryData: ApolloQueryResult< GetCurrentTemplateQuery >,
@@ -59,7 +59,7 @@ export default function parseQueryResult(
  *
  * @param templateByUri The template data fetched for the uri.
  *
- * @return The body classes.
+ * @return {Array<string>|undefined} The body classes.
  */
 function parseBodyClasses(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ]
@@ -85,7 +85,7 @@ function parseBodyClasses(
  * @param templateByUri The template data fetched for the uri.
  * @param wordpressUrl The base URL of the WordPress site.
  *
- * @return The enqueued scripts.
+ * @return {Array<EnqueuedScriptProps>|undefined} The enqueued scripts.
  */
 function parseEnqueuedScripts(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ],
@@ -109,7 +109,7 @@ function parseEnqueuedScripts(
  *
  * @param templateByUri The template data fetched for the uri.
  *
- * @return The editor blocks.
+ * @return {Array<BlockData>|undefined} The editor blocks.
  */
 function parseEditorBlocks(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ]
@@ -135,7 +135,7 @@ function parseEditorBlocks(
  * @param wordpressUrl The base URL of the WordPress site.
  * @param templateByUri The template data fetched for the uri.
  *
- * @return The enqueued stylesheets.
+ * @return {Array<StyleSheetProps>|undefined} The enqueued stylesheets.
  */
 function parseEnqueuedStylesheets(
 	wordpressUrl: string,
@@ -157,7 +157,7 @@ function parseEnqueuedStylesheets(
  * @param templateByUri The template data fetched for the uri.
  * @param wordpressUrl The base URL of the WordPress site.
  *
- * @return The script modules.
+ * @return {Array<ScriptModuleProps>|undefined} The script modules.
  */
 function parseScriptModules(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ],

From 14b082be33a9c0ba8b5d581233e3c951e4988a2a Mon Sep 17 00:00:00 2001
From: Amaan Khan <amaanpathan5@gmail.com>
Date: Tue, 11 Mar 2025 21:00:31 +0530
Subject: [PATCH 02/11] feat: add
 @typescript-eslint/explicit-function-return-type rule

---
 .eslintrc.cjs                                 |  4 ++-
 packages/blocks/src/block-manager/index.tsx   |  4 ++-
 packages/blocks/src/blocks/core-group.tsx     |  7 +++++-
 packages/blocks/src/blocks/core-image.tsx     |  8 +++---
 .../blocks/src/blocks/core-media-text.tsx     |  5 +++-
 packages/blocks/src/blocks/core-video.tsx     |  6 ++++-
 .../src/editor-blocks-renderer/index.tsx      |  6 ++---
 .../core/src/config/snapwp-config-manager.ts  |  4 +--
 .../tests/snapwp-config-manager.test.tsx      |  2 +-
 packages/core/src/utils/cn.ts                 |  2 +-
 .../core/src/utils/get-color-class-name.ts    |  2 +-
 .../src/utils/get-styles-from-attributes.ts   |  3 ++-
 packages/core/src/utils/is-valid-url.ts       |  2 +-
 .../utils/parse-external-remote-patterns.ts   |  7 +++++-
 packages/core/src/utils/replace-host-url.ts   |  2 +-
 .../next/src/components/default-error.tsx     |  2 +-
 packages/next/src/components/font.tsx         |  4 ++-
 packages/next/src/components/image.tsx        |  2 +-
 packages/next/src/components/link.tsx         |  2 +-
 .../next/src/components/script-module.tsx     |  2 +-
 packages/next/src/components/script.tsx       |  2 +-
 packages/next/src/config/with-snap-wp.ts      |  4 +--
 packages/next/src/middleware/utils.ts         |  4 ++-
 packages/next/src/react-parser/index.tsx      |  2 +-
 packages/next/src/root-layout/global-head.tsx |  2 +-
 packages/next/src/root-layout/index.tsx       |  4 +--
 packages/next/src/template-renderer/index.tsx |  2 +-
 .../src/template-renderer/template-head.tsx   |  4 ++-
 .../template-renderer/template-scripts.tsx    | 14 +++++++----
 packages/query/src/query-engine/index.ts      | 25 +++++++++++++++----
 packages/query/src/utils/parse-template.ts    |  8 +++++-
 31 files changed, 100 insertions(+), 47 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index b6ffd96d..ceaa7a5c 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -71,7 +71,9 @@ module.exports = {
 
 		// Turn of JSdoc types and use TypeScript types instead.
 		'jsdoc/no-types': [ 'off' ],
-		'jsdoc/require-returns-type': [ 'error' ],
+		'jsdoc/require-returns-type': [ 'warn' ],
+
+		'@typescript-eslint/explicit-function-return-type': 'error',
 
 		// Restrict the use of empty functions.
 		'no-empty-function': 'error',
diff --git a/packages/blocks/src/block-manager/index.tsx b/packages/blocks/src/block-manager/index.tsx
index 84c011f2..d70e84c0 100644
--- a/packages/blocks/src/block-manager/index.tsx
+++ b/packages/blocks/src/block-manager/index.tsx
@@ -14,7 +14,9 @@ export default class BlockManager {
 	 * Update block definitions to be used while rendering blocks.
 	 * @param blockDefinitions - rendering implementaion for blocks.
 	 */
-	public static addBlockDefinitions( blockDefinitions: BlockDefinitions ) {
+	public static addBlockDefinitions(
+		blockDefinitions: BlockDefinitions
+	): void {
 		BlockManager.blockDefinitions = {
 			...BlockManager.blockDefinitions,
 			...blockDefinitions,
diff --git a/packages/blocks/src/blocks/core-group.tsx b/packages/blocks/src/blocks/core-group.tsx
index bd2b2ec9..63753b7b 100644
--- a/packages/blocks/src/blocks/core-group.tsx
+++ b/packages/blocks/src/blocks/core-group.tsx
@@ -21,7 +21,12 @@ import type {
  *
  * @return {React.JSX.Element} The rendered HTML element or the children if no tag name is provided.
  */
-const Tag = ( { name, className, style, children }: TagProps ) => {
+const Tag = ( {
+	name,
+	className,
+	style,
+	children,
+}: TagProps ): React.JSX.Element => {
 	if ( ! name ) {
 		return <>{ children }</>;
 	}
diff --git a/packages/blocks/src/blocks/core-image.tsx b/packages/blocks/src/blocks/core-image.tsx
index 37bab85d..bdf00f00 100644
--- a/packages/blocks/src/blocks/core-image.tsx
+++ b/packages/blocks/src/blocks/core-image.tsx
@@ -39,7 +39,7 @@ const Figure = ( {
 	linkTarget,
 	rel,
 	lightbox,
-}: FigureProps ) => {
+}: FigureProps ): React.JSX.Element => {
 	let props: ComponentProps< 'figure' > = {};
 
 	if ( isLightboxEnabled( lightbox ) ) {
@@ -248,7 +248,7 @@ const getImageProps = (
  * @return {boolean} Whether the lightbox is enabled.
  */
 //@ts-ignore -- Stubbed until lightbox support is fixed.
-const isLightboxEnabled = ( lightbox?: string | null ) => {
+const isLightboxEnabled = ( lightbox?: string | null ): boolean => {
 	// if ( ! lightbox ) {
 	// 	return false;
 	// }
@@ -271,7 +271,7 @@ const isLightboxEnabled = ( lightbox?: string | null ) => {
 const extractInteractivityAttributesForElement = (
 	element: string,
 	renderedHtml?: string | null
-) => {
+): Record< string, string > => {
 	if ( ! renderedHtml ) {
 		return {};
 	}
@@ -311,7 +311,7 @@ const extractInteractivityAttributesForElement = (
 const extractAriaAttributesForElement = (
 	element: string,
 	renderedHtml?: string | null
-) => {
+): Record< string, string > => {
 	if ( ! renderedHtml ) {
 		return {};
 	}
diff --git a/packages/blocks/src/blocks/core-media-text.tsx b/packages/blocks/src/blocks/core-media-text.tsx
index cb23a8c3..b0d59d91 100644
--- a/packages/blocks/src/blocks/core-media-text.tsx
+++ b/packages/blocks/src/blocks/core-media-text.tsx
@@ -31,7 +31,10 @@ const DEFAULT_MEDIA_SIZE_SLUG = 'full';
  *
  * @return {Object} CSS styles for the image fill.
  */
-function imageFillStyles( url?: string, focalPoint?: FocalPoint ) {
+function imageFillStyles(
+	url?: string,
+	focalPoint?: FocalPoint
+): { objectPosition: string } | { objectPosition?: undefined } {
 	return url
 		? {
 				objectPosition: focalPoint
diff --git a/packages/blocks/src/blocks/core-video.tsx b/packages/blocks/src/blocks/core-video.tsx
index 3d5f175a..075b1c20 100644
--- a/packages/blocks/src/blocks/core-video.tsx
+++ b/packages/blocks/src/blocks/core-video.tsx
@@ -19,7 +19,11 @@ import type {
  *
  * @return {React.JSX.Element|null} A list of `<track>` elements or `null` if no tracks are provided.
  */
-const Tracks = ( { tracks }: { tracks?: TrackProps[] } ) => {
+const Tracks = ( {
+	tracks,
+}: {
+	tracks?: TrackProps[];
+} ): React.JSX.Element | null => {
 	if ( ! tracks || tracks.length === 0 ) {
 		return null;
 	}
diff --git a/packages/blocks/src/editor-blocks-renderer/index.tsx b/packages/blocks/src/editor-blocks-renderer/index.tsx
index 92c7c0a7..46401870 100644
--- a/packages/blocks/src/editor-blocks-renderer/index.tsx
+++ b/packages/blocks/src/editor-blocks-renderer/index.tsx
@@ -15,12 +15,12 @@ type EditorBlocksRendererProps = {
  * @param props.editorBlocks - A list of blocks to be rendered.
  * @param props.blockDefinitions - Blocks rendering functions.
  *
- * @return {React.JSX.Element} The rendered template.
+ * @return {Array<React.JSX.Element>} The rendered template.
  */
 export default function EditorBlocksRenderer( {
 	editorBlocks,
 	blockDefinitions,
-}: EditorBlocksRendererProps ) {
+}: EditorBlocksRendererProps ): React.JSX.Element[] {
 	const { blockDefinitions: globalBlockDefinitions } = getConfig();
 
 	const resolvedBlockDefinitions = globalBlockDefinitions ?? blockDefinitions;
@@ -32,7 +32,7 @@ export default function EditorBlocksRenderer( {
 	const parsedTree = BlockManager.parseBlockForRendering( editorBlocks );
 
 	// eslint-disable-next-line jsdoc/require-jsdoc -- Disable jsdoc for local function.
-	const renderNode = ( node: BlockTreeNode ) => {
+	const renderNode = ( node: BlockTreeNode ): React.JSX.Element => {
 		const props: Record< any, any > = {
 			key: node.clientId,
 			...node,
diff --git a/packages/core/src/config/snapwp-config-manager.ts b/packages/core/src/config/snapwp-config-manager.ts
index 38c00546..52463302 100644
--- a/packages/core/src/config/snapwp-config-manager.ts
+++ b/packages/core/src/config/snapwp-config-manager.ts
@@ -223,7 +223,7 @@ class SnapWPConfigManager {
 	 *
 	 * @return {Partial<Type>} The normalized configuration.
 	 */
-	static normalizeConfig = < T >( cfg: Partial< T > ) => {
+	static normalizeConfig = < T >( cfg: Partial< T > ): Partial< T > => {
 		// Removing empty values.
 		( Object.keys( cfg ) as Array< keyof T > ).forEach(
 			( key: keyof T ) => {
@@ -324,7 +324,7 @@ class SnapWPConfigManager {
 		 *
 		 * @throws {Error} If the property is invalid.
 		 */
-		const validateProperty = ( key: keyof T ) => {
+		const validateProperty = ( key: keyof T ): void => {
 			const prop = schema[ key ];
 			const value = config[ key ];
 
diff --git a/packages/core/src/config/tests/snapwp-config-manager.test.tsx b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
index 73c3b4cb..4bbf63ad 100644
--- a/packages/core/src/config/tests/snapwp-config-manager.test.tsx
+++ b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
@@ -14,7 +14,7 @@ import React from 'react';
  *
  * @return {React.JSX.Element} A div containing "Test Block".
  */
-const MockBlockComponent = () => <div>Test Block</div>;
+const MockBlockComponent = (): React.JSX.Element => <div>Test Block</div>;
 
 describe( 'SnapWPConfigManager functions', () => {
 	let ORIG_ENV: NodeJS.ProcessEnv;
diff --git a/packages/core/src/utils/cn.ts b/packages/core/src/utils/cn.ts
index d2eefb19..2ee88084 100644
--- a/packages/core/src/utils/cn.ts
+++ b/packages/core/src/utils/cn.ts
@@ -9,6 +9,6 @@ import { type ClassValue, clsx } from 'clsx';
  *
  * @internal
  */
-export default function cn( ...inputs: ClassValue[] ) {
+export default function cn( ...inputs: ClassValue[] ): string {
 	return clsx( inputs );
 }
diff --git a/packages/core/src/utils/get-color-class-name.ts b/packages/core/src/utils/get-color-class-name.ts
index 724f8299..8ffcb028 100644
--- a/packages/core/src/utils/get-color-class-name.ts
+++ b/packages/core/src/utils/get-color-class-name.ts
@@ -9,7 +9,7 @@
 export default function getColorClassName(
 	colorContextName?: string,
 	colorSlug?: string
-) {
+): string | undefined {
 	if ( ! colorContextName || ! colorSlug ) {
 		return undefined;
 	}
diff --git a/packages/core/src/utils/get-styles-from-attributes.ts b/packages/core/src/utils/get-styles-from-attributes.ts
index 928cec0c..ddf31914 100644
--- a/packages/core/src/utils/get-styles-from-attributes.ts
+++ b/packages/core/src/utils/get-styles-from-attributes.ts
@@ -1,5 +1,6 @@
 import { compileCSS } from '@wordpress/style-engine';
 import getStyleObjectFromString from './get-style-object-from-string';
+import type { CSSProperties } from 'react';
 
 interface AttributesWithStyle {
 	style?: string;
@@ -14,7 +15,7 @@ interface AttributesWithStyle {
  */
 export default function getStylesFromAttributes(
 	attributes: AttributesWithStyle
-) {
+): CSSProperties {
 	if ( ! attributes?.style ) {
 		return {};
 	}
diff --git a/packages/core/src/utils/is-valid-url.ts b/packages/core/src/utils/is-valid-url.ts
index 94114058..c0698ace 100644
--- a/packages/core/src/utils/is-valid-url.ts
+++ b/packages/core/src/utils/is-valid-url.ts
@@ -5,7 +5,7 @@
  *
  * @internal
  */
-export default function isValidUrl( str: string ) {
+export default function isValidUrl( str: string ): boolean {
 	// When an invalid URL is passed, URL() throws an error. If an error is thrown, we will return false.
 	try {
 		const url = new URL( str );
diff --git a/packages/core/src/utils/parse-external-remote-patterns.ts b/packages/core/src/utils/parse-external-remote-patterns.ts
index 3e2f834a..49cb0239 100644
--- a/packages/core/src/utils/parse-external-remote-patterns.ts
+++ b/packages/core/src/utils/parse-external-remote-patterns.ts
@@ -6,7 +6,12 @@
  *
  * @internal
  */
-export default function parseExternalRemotePatterns( str?: string ) {
+export default function parseExternalRemotePatterns( str?: string ): ( {
+	protocol?: string;
+	hostname?: string;
+	port?: string;
+	pathname?: string;
+} | null )[] {
 	if ( ! str ) {
 		return [
 			{
diff --git a/packages/core/src/utils/replace-host-url.ts b/packages/core/src/utils/replace-host-url.ts
index d8bc0ce6..cb930906 100644
--- a/packages/core/src/utils/replace-host-url.ts
+++ b/packages/core/src/utils/replace-host-url.ts
@@ -13,7 +13,7 @@ export default function replaceHostUrl(
 	url: string,
 	hostUrl: string,
 	newHostUrl: string
-) {
+): string {
 	if ( url && hostUrl && url.startsWith( hostUrl ) ) {
 		return url.replace( hostUrl, newHostUrl );
 	}
diff --git a/packages/next/src/components/default-error.tsx b/packages/next/src/components/default-error.tsx
index 63d2fa2c..97ae75ef 100644
--- a/packages/next/src/components/default-error.tsx
+++ b/packages/next/src/components/default-error.tsx
@@ -20,7 +20,7 @@ export default function DefaultError( {
 }: {
 	error: Error & { digest?: string };
 	reset: () => void;
-} ) {
+} ): React.JSX.Element {
 	const unknownError =
 		'An unexpected error has occurred. Please check the logs for more details.';
 	const tryAgain = 'Try Again';
diff --git a/packages/next/src/components/font.tsx b/packages/next/src/components/font.tsx
index 939880c1..1b636816 100644
--- a/packages/next/src/components/font.tsx
+++ b/packages/next/src/components/font.tsx
@@ -10,7 +10,9 @@ import React from 'react';
  *
  * @todo Implement next/font once a solution for handling literal types is determined.
  */
-export default function Fonts( props: { renderedFontFaces: string } ) {
+export default function Fonts( props: {
+	renderedFontFaces: string;
+} ): React.JSX.Element {
 	const { renderedFontFaces } = props;
 
 	// @todo: we might need to proxy these for CORS.
diff --git a/packages/next/src/components/image.tsx b/packages/next/src/components/image.tsx
index e5ec891c..5c2ab077 100644
--- a/packages/next/src/components/image.tsx
+++ b/packages/next/src/components/image.tsx
@@ -60,7 +60,7 @@ export default function Image( {
 	...props
 }: PropsWithoutRef<
 	ImageInterface & ( ImageProps | ImgHTMLAttributes< HTMLImageElement > )
-> ) {
+> ): React.JSX.Element | null {
 	const altText = alt || image?.altText || '';
 	const originalWidth = image?.mediaDetails?.width;
 	const originalHeight = image?.mediaDetails?.height;
diff --git a/packages/next/src/components/link.tsx b/packages/next/src/components/link.tsx
index fab86ec6..d80485ec 100644
--- a/packages/next/src/components/link.tsx
+++ b/packages/next/src/components/link.tsx
@@ -32,7 +32,7 @@ export default function Link( {
 	...props
 }: PropsWithChildren<
 	LinkInterface & ( LinkProps | AnchorHTMLAttributes< HTMLAnchorElement > )
-> ) {
+> ): React.JSX.Element {
 	const { homeUrl, nextUrl, graphqlEndpoint } = getConfig();
 
 	const internalUri = href
diff --git a/packages/next/src/components/script-module.tsx b/packages/next/src/components/script-module.tsx
index f4b44ffc..8b6ca0c0 100644
--- a/packages/next/src/components/script-module.tsx
+++ b/packages/next/src/components/script-module.tsx
@@ -41,7 +41,7 @@ export default function ScriptModule( {
 	dependencies,
 	extraData,
 	...props
-}: PropsWithoutRef< ScriptModuleInterface > ) {
+}: PropsWithoutRef< ScriptModuleInterface > ): React.JSX.Element {
 	// Generate dependency scripts
 	const DependencyScripts = dependencies?.map( ( dep, index ) => {
 		if ( ! dep?.connectedScriptModule ) {
diff --git a/packages/next/src/components/script.tsx b/packages/next/src/components/script.tsx
index ffa9e9a4..7f6acaca 100644
--- a/packages/next/src/components/script.tsx
+++ b/packages/next/src/components/script.tsx
@@ -34,7 +34,7 @@ export default function Script( {
 	src,
 	loadingStrategy,
 	...props
-}: PropsWithoutRef< ScriptInterface & ScriptProps > ) {
+}: PropsWithoutRef< ScriptInterface & ScriptProps > ): React.JSX.Element {
 	const beforeScript = Array.isArray( before )
 		? before.join( ' ' )
 		: undefined;
diff --git a/packages/next/src/config/with-snap-wp.ts b/packages/next/src/config/with-snap-wp.ts
index e89330ab..2a0ffe2e 100644
--- a/packages/next/src/config/with-snap-wp.ts
+++ b/packages/next/src/config/with-snap-wp.ts
@@ -25,7 +25,7 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 	 *
 	 * @return {any} The modified webpack configuration.
 	 */
-	return ( config: any ) => {
+	return ( config: any ): any => {
 		const configPath = `
 			import __snapWPConfig from '${ snapWPConfigPath }';
 		`;
@@ -41,7 +41,7 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 						 *
 						 * @return {boolean} `true` if the module should be modified, otherwise `false`.
 						 */
-						test: ( normalModule ) => {
+						test: ( normalModule ): boolean => {
 							const userRequest = normalModule.userRequest || '';
 
 							const startIndex =
diff --git a/packages/next/src/middleware/utils.ts b/packages/next/src/middleware/utils.ts
index ff99a529..c6460c06 100644
--- a/packages/next/src/middleware/utils.ts
+++ b/packages/next/src/middleware/utils.ts
@@ -47,7 +47,9 @@ export function appMiddlewares(
  *
  * @return {Array<MiddlewareFactory>} Array combining default middlewares and custom middlewares.
  */
-export function stackMiddlewares( middlewares: MiddlewareFactory[] = [] ) {
+export function stackMiddlewares(
+	middlewares: MiddlewareFactory[] = []
+): Array< MiddlewareFactory > {
 	const { useCorsProxy } = getConfig();
 
 	const defaultMiddlewares = [ cm, proxies ];
diff --git a/packages/next/src/react-parser/index.tsx b/packages/next/src/react-parser/index.tsx
index 13911b6e..0a759373 100644
--- a/packages/next/src/react-parser/index.tsx
+++ b/packages/next/src/react-parser/index.tsx
@@ -11,7 +11,7 @@ import type { HTMLReactParserOptions } from 'html-react-parser';
  *
  * @return {React.JSX.Element} The rendered React components.
  */
-export default function Parse( { html }: { html: string } ) {
+export default function Parse( { html }: { html: string } ): React.JSX.Element {
 	const {
 		parserOptions = defaultOptions,
 	}: { parserOptions?: HTMLReactParserOptions } = getConfig();
diff --git a/packages/next/src/root-layout/global-head.tsx b/packages/next/src/root-layout/global-head.tsx
index 8e42afd0..44d5c4f1 100644
--- a/packages/next/src/root-layout/global-head.tsx
+++ b/packages/next/src/root-layout/global-head.tsx
@@ -17,7 +17,7 @@ export function GlobalHead( {
 	customCss,
 	globalStylesheet,
 	renderedFontFaces,
-}: GlobalHeadProps ) {
+}: GlobalHeadProps ): React.JSX.Element {
 	return (
 		<>
 			{ globalStylesheet && (
diff --git a/packages/next/src/root-layout/index.tsx b/packages/next/src/root-layout/index.tsx
index bf0c5c9e..3569f84f 100644
--- a/packages/next/src/root-layout/index.tsx
+++ b/packages/next/src/root-layout/index.tsx
@@ -12,12 +12,12 @@ export type RootLayoutProps = {
  * @param props.getGlobalStyles - A async callback to get global styles.
  * @param props.children - Child components.
  *
- * @return {React.JSX.Element} The rendered template.
+ * @return {Promise<React.JSX.Element>} The rendered template.
  */
 export async function RootLayout( {
 	getGlobalStyles = QueryEngine.getGlobalStyles,
 	children,
-}: PropsWithChildren< RootLayoutProps > ) {
+}: PropsWithChildren< RootLayoutProps > ): Promise< React.JSX.Element > {
 	const globalHeadProps = await getGlobalStyles();
 
 	return (
diff --git a/packages/next/src/template-renderer/index.tsx b/packages/next/src/template-renderer/index.tsx
index bef14fed..87a3fb8f 100644
--- a/packages/next/src/template-renderer/index.tsx
+++ b/packages/next/src/template-renderer/index.tsx
@@ -24,7 +24,7 @@ export type TemplateRendererProps = {
 export async function TemplateRenderer( {
 	getTemplateData = QueryEngine.getTemplateData,
 	children,
-}: TemplateRendererProps ) {
+}: TemplateRendererProps ): Promise< React.JSX.Element > {
 	const headerList = await headers(); // headers() returns a Promise from NextJS 19.
 	const pathname = headerList.get( 'x-current-path' );
 
diff --git a/packages/next/src/template-renderer/template-head.tsx b/packages/next/src/template-renderer/template-head.tsx
index fadeb852..6cc1fdaa 100644
--- a/packages/next/src/template-renderer/template-head.tsx
+++ b/packages/next/src/template-renderer/template-head.tsx
@@ -9,7 +9,9 @@ import { type TemplateHeadProps } from '@snapwp/core';
  *
  * @return {Array<React.JSX.Element>|null} A head element containing the provided styles and links.
  */
-export function TemplateHead( { stylesheets }: TemplateHeadProps ) {
+export function TemplateHead( {
+	stylesheets,
+}: TemplateHeadProps ): Array< React.JSX.Element > | null {
 	if ( ! stylesheets ) {
 		return null;
 	}
diff --git a/packages/next/src/template-renderer/template-scripts.tsx b/packages/next/src/template-renderer/template-scripts.tsx
index 61fa207a..51431ca2 100644
--- a/packages/next/src/template-renderer/template-scripts.tsx
+++ b/packages/next/src/template-renderer/template-scripts.tsx
@@ -13,7 +13,11 @@ import { getConfig } from '@snapwp/core/config';
  *
  * @return {React.JSX.Element} A collection of `<Script />` components.
  */
-const ScriptMap = ( { scripts }: { scripts: EnqueuedScriptProps[] } ) => (
+const ScriptMap = ( {
+	scripts,
+}: {
+	scripts: EnqueuedScriptProps[];
+} ): React.JSX.Element => (
 	<>
 		{ scripts?.map( ( { handle, src, ...rest }, id ) => {
 			return (
@@ -39,7 +43,7 @@ const ImportMap = ( {
 	scriptModules,
 }: {
 	scriptModules: ScriptModuleProps[];
-} ) => {
+} ): React.JSX.Element | null => {
 	// Generate import map from all module dependencies
 	const { homeUrl, corsProxyPrefix, useCorsProxy } = getConfig();
 
@@ -82,13 +86,13 @@ const ImportMap = ( {
  * @param props - The props for the component.
  * @param props.scriptModules - Array of script module objects to be rendered.
  *
- * @return {React.JSX.Element} A collection of `<ScriptModule />` components.
+ * @return {React.JSX.Element|null} A collection of `<ScriptModule />` components.
  */
 const ScriptModuleMap = ( {
 	scriptModules,
 }: {
 	scriptModules?: ScriptModuleProps[];
-} ) => {
+} ): React.JSX.Element | null => {
 	const { homeUrl, corsProxyPrefix, useCorsProxy } = getConfig();
 	// Array to store handles of script modules that should not be loaded
 	const uniqueScriptModuleDependencies = new Set< string >();
@@ -174,7 +178,7 @@ export function TemplateScripts( {
 }: PropsWithChildren< {
 	scripts: EnqueuedScriptProps[] | undefined;
 	scriptModules: ScriptModuleProps[] | undefined;
-} > ) {
+} > ): React.JSX.Element {
 	// Separate scripts by location
 	const headerScripts =
 		scripts?.filter( ( script ) => script.groupLocation === 'HEADER' ) ??
diff --git a/packages/query/src/query-engine/index.ts b/packages/query/src/query-engine/index.ts
index f743553d..91721ac3 100644
--- a/packages/query/src/query-engine/index.ts
+++ b/packages/query/src/query-engine/index.ts
@@ -13,7 +13,14 @@ import {
 } from '@apollo/client';
 import parseTemplate from '@/utils/parse-template';
 import parseGlobalStyles from '@/utils/parse-global-styles';
-import { Logger, type GlobalHeadProps } from '@snapwp/core';
+import type { BlockData } from '@snapwp/types';
+import {
+	Logger,
+	type GlobalHeadProps,
+	type EnqueuedScriptProps,
+	type StyleSheetProps,
+	type ScriptModuleProps,
+} from '@snapwp/core';
 
 /**
  * Singleton class to handle GraphQL queries using Apollo.
@@ -29,7 +36,7 @@ export class QueryEngine {
 	/**
 	 * Initializer.
 	 */
-	public static initialize() {
+	public static initialize(): void {
 		QueryEngine.graphqlEndpoint = getGraphqlUrl();
 
 		const { homeUrl } = getConfig();
@@ -94,9 +101,17 @@ export class QueryEngine {
 	 * Fetches blocks, scripts and styles for the given uri.
 	 * @param uri - The URL of the seed node.
 	 *
-	 * @return {object|undefined} The template data fetched for the uri.
+	 * @return {Promise<Object>} The template data fetched for the uri.
 	 */
-	static getTemplateData = async ( uri: string ) => {
+	static getTemplateData = async (
+		uri: string
+	): Promise< {
+		stylesheets: StyleSheetProps[] | undefined;
+		editorBlocks: BlockData< Record< string, unknown > >[] | undefined;
+		scripts: EnqueuedScriptProps[] | undefined;
+		scriptModules: ScriptModuleProps[] | undefined;
+		bodyClasses: string[] | undefined;
+	} > => {
 		if ( ! QueryEngine.isClientInitialized ) {
 			QueryEngine.initialize();
 		}
@@ -135,7 +150,7 @@ export class QueryEngine {
  *
  * @param error - The Apollo error.
  */
-const logApolloErrors = ( error: ApolloError ) => {
+const logApolloErrors = ( error: ApolloError ): void => {
 	// If there are graphQLErrors log them.
 	error.graphQLErrors.forEach( ( graphQLError ) => {
 		Logger.error( graphQLError.message );
diff --git a/packages/query/src/utils/parse-template.ts b/packages/query/src/utils/parse-template.ts
index 23cdcee6..a8c67713 100644
--- a/packages/query/src/utils/parse-template.ts
+++ b/packages/query/src/utils/parse-template.ts
@@ -22,7 +22,13 @@ export default function parseQueryResult(
 	queryData: ApolloQueryResult< GetCurrentTemplateQuery >,
 	wordpressUrl: string,
 	uri: string
-) {
+): {
+	stylesheets: StyleSheetProps[] | undefined;
+	editorBlocks: BlockData< Record< string, unknown > >[] | undefined;
+	scripts: EnqueuedScriptProps[] | undefined;
+	scriptModules: ScriptModuleProps[] | undefined;
+	bodyClasses: string[] | undefined;
+} {
 	if ( queryData.errors?.length ) {
 		queryData.errors?.forEach( ( error ) => {
 			Logger.error(

From 6b0a7875d7a496f5db3abaef1b52d12df5217666 Mon Sep 17 00:00:00 2001
From: Amaan Khan <amaanpathan5@gmail.com>
Date: Tue, 11 Mar 2025 21:11:46 +0530
Subject: [PATCH 03/11] refactor: migrates
 @typescript-eslint/explicit-function-return-type rule to TS files

---
 .eslintrc.cjs               | 3 +--
 packages/cli/src/snapwp.cjs | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 305d9939..931a9e99 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -73,8 +73,6 @@ module.exports = {
 		'jsdoc/no-types': [ 'off' ],
 		'jsdoc/require-returns-type': [ 'warn' ],
 
-		'@typescript-eslint/explicit-function-return-type': 'error',
-
 		// Restrict the use of empty functions.
 		'no-empty-function': 'error',
 
@@ -136,6 +134,7 @@ module.exports = {
 			rules: {
 				'dot-notation': 'off',
 				'@typescript-eslint/dot-notation': 'error',
+				'@typescript-eslint/explicit-function-return-type': 'error',
 			},
 			parserOptions: {
 				project: true,
diff --git a/packages/cli/src/snapwp.cjs b/packages/cli/src/snapwp.cjs
index 83478265..811dc612 100755
--- a/packages/cli/src/snapwp.cjs
+++ b/packages/cli/src/snapwp.cjs
@@ -8,7 +8,6 @@ const fs = require( 'fs/promises' );
 const path = require( 'path' );
 const readline = require( 'readline' );
 const { program } = require( 'commander' );
-const {string} = require("../../../../../../wp-includes/js/clipboard.js");
 
 program.option( '--proxy', 'Use proxy registry.' ).parse();
 
@@ -43,7 +42,8 @@ const prompt = ( query ) => {
  * This function resolves with a success object indicating the result of the operation.
  *
  * @param filePath - The path to the file to be opened in the editor.
- * @return - A promise that resolves to an object containing:
+ *
+ * @return {Promise<Object>} - A promise that resolves to an object containing:
  *                              - success: {boolean} Indicates if the operation was successful.
  *                              - message: {string} Provides additional information or error details.
  */

From f5960a44ee58c15b89644d4327cba72f497d02cd Mon Sep 17 00:00:00 2001
From: Amaan Khan <amaanpathan5@gmail.com>
Date: Thu, 13 Mar 2025 19:47:12 +0530
Subject: [PATCH 04/11] refactor: migrate jsdoc/require-returns to
 jsdoc/require-returns-type

---
 .eslintrc.cjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 931a9e99..f1eaa0ca 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -71,7 +71,7 @@ module.exports = {
 
 		// Turn of JSdoc types and use TypeScript types instead.
 		'jsdoc/no-types': [ 'off' ],
-		'jsdoc/require-returns-type': [ 'warn' ],
+		'jsdoc/require-returns': [ 'warn' ],
 
 		// Restrict the use of empty functions.
 		'no-empty-function': 'error',

From 8f07f69e79b9b7a0129f1a5bd4be297dacb70edb Mon Sep 17 00:00:00 2001
From: Amaan Khan <amaanpathan5@gmail.com>
Date: Thu, 13 Mar 2025 20:59:50 +0530
Subject: [PATCH 05/11] feat: add return types

---
 packages/e2e-tests/src/utils/cleanup.ts              | 4 +++-
 packages/e2e-tests/src/utils/setup-next-app.ts       | 4 +++-
 packages/e2e-tests/src/utils/setup-snapwp-helper.ts  | 4 +++-
 packages/e2e-tests/src/utils/setup-wordpress.ts      | 4 +++-
 packages/e2e-tests/src/utils/start-next-app.ts       | 4 +++-
 packages/e2e-tests/src/utils/start-proxy-registry.ts | 4 +++-
 packages/e2e-tests/src/utils/wait-for-server.ts      | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/e2e-tests/src/utils/cleanup.ts b/packages/e2e-tests/src/utils/cleanup.ts
index 128aafd1..5e063e61 100644
--- a/packages/e2e-tests/src/utils/cleanup.ts
+++ b/packages/e2e-tests/src/utils/cleanup.ts
@@ -7,8 +7,10 @@ import { execSync } from 'child_process';
  *
  * - Stops Next.js, WordPress (`wp-env`), and the local registry.
  * - Deletes `snapwp-helper` and `test-app` directories if they exist.
+ *
+ * @return {void}
  */
-export default function cleanup() {
+export default function cleanup(): void {
 	try {
 		if ( process.env[ 'NEXT_PID' ] ) {
 			console.log( 'Stopping Next.js...' );
diff --git a/packages/e2e-tests/src/utils/setup-next-app.ts b/packages/e2e-tests/src/utils/setup-next-app.ts
index 923d8b8f..7bc060dc 100644
--- a/packages/e2e-tests/src/utils/setup-next-app.ts
+++ b/packages/e2e-tests/src/utils/setup-next-app.ts
@@ -6,8 +6,10 @@ import startProxyRegistry from './start-proxy-registry';
 /**
  * Sets up the Next.js app by creating a test directory, writing environment variables,
  * and running the SnapWP setup.
+ *
+ * @return {Promise<void>}
  */
-export default async function setupNextApp() {
+export default async function setupNextApp(): Promise< void > {
 	const testAppDir = path.join( process.cwd(), 'test-app' );
 
 	console.log( 'Setting up Next.js app...' );
diff --git a/packages/e2e-tests/src/utils/setup-snapwp-helper.ts b/packages/e2e-tests/src/utils/setup-snapwp-helper.ts
index ba2d1825..a057d661 100644
--- a/packages/e2e-tests/src/utils/setup-snapwp-helper.ts
+++ b/packages/e2e-tests/src/utils/setup-snapwp-helper.ts
@@ -5,8 +5,10 @@ import path from 'path';
  * Clones the SnapWP Helper plugin, installs dependencies, and builds it.
  *
  * @throws If any command fails, an error is logged and rethrown.
+ *
+ * @return {void}
  */
-export default function setupSnapWPHelper() {
+export default function setupSnapWPHelper(): void {
 	const pluginPath = path.join( process.cwd(), 'snapwp-helper' );
 	try {
 		execSync( 'git clone https://github.com/rtCamp/snapwp-helper.git', {
diff --git a/packages/e2e-tests/src/utils/setup-wordpress.ts b/packages/e2e-tests/src/utils/setup-wordpress.ts
index 63b7c353..49473d16 100644
--- a/packages/e2e-tests/src/utils/setup-wordpress.ts
+++ b/packages/e2e-tests/src/utils/setup-wordpress.ts
@@ -5,8 +5,10 @@ import setupSnapWPHelper from './setup-snapwp-helper';
 /**
  * Sets up the WordPress environment by starting the server,
  * waiting for it to be available, and configuring permalinks.
+ *
+ * @return {Promise<void>}
  */
-export default async function setupWordPress() {
+export default async function setupWordPress(): Promise< void > {
 	console.log( 'Starting WordPress environment...' );
 
 	try {
diff --git a/packages/e2e-tests/src/utils/start-next-app.ts b/packages/e2e-tests/src/utils/start-next-app.ts
index f0fe7063..b670f868 100644
--- a/packages/e2e-tests/src/utils/start-next-app.ts
+++ b/packages/e2e-tests/src/utils/start-next-app.ts
@@ -4,8 +4,10 @@ import waitForServer from './wait-for-server';
 
 /**
  * Starts the Next.js app by installing dependencies, building the project, and running the server.
+ *
+ * @return {Promise<void>}
  */
-export default async function startNextApp() {
+export default async function startNextApp(): Promise< void > {
 	console.log( 'Starting Next.js app...' );
 	const testAppDir = path.join( process.cwd(), 'test-app' );
 
diff --git a/packages/e2e-tests/src/utils/start-proxy-registry.ts b/packages/e2e-tests/src/utils/start-proxy-registry.ts
index 3843cf7f..904f29c7 100644
--- a/packages/e2e-tests/src/utils/start-proxy-registry.ts
+++ b/packages/e2e-tests/src/utils/start-proxy-registry.ts
@@ -4,8 +4,10 @@ import { execSync } from 'child_process';
  * Starts the local proxy registry by running the `publish:local` script.
  *
  * @throws If the command fails, an error is logged and rethrown.
+ *
+ * @return {void}
  */
-export default function startProxyRegistry() {
+export default function startProxyRegistry(): void {
 	try {
 		execSync( 'npm run publish:local', {
 			stdio: 'inherit',
diff --git a/packages/e2e-tests/src/utils/wait-for-server.ts b/packages/e2e-tests/src/utils/wait-for-server.ts
index 58384256..535ec4ce 100644
--- a/packages/e2e-tests/src/utils/wait-for-server.ts
+++ b/packages/e2e-tests/src/utils/wait-for-server.ts
@@ -5,12 +5,14 @@
  * @param timeout - Max wait time per attempt in ms.
  * @param retries - Number of retry attempts (default: 5).
  * @throws If the server doesn't respond after all retries.
+ *
+ * @return {Promise<void>}
  */
 export default async function waitForServer(
 	url: string,
 	timeout = 10000,
 	retries = 5
-) {
+): Promise< void > {
 	try {
 		await fetch( url, {
 			method: 'HEAD',

From cb35052fe25b89f844ad89dbd0b0d57334e7375c Mon Sep 17 00:00:00 2001
From: Amaan Khan <amaanpathan5@gmail.com>
Date: Sun, 23 Mar 2025 19:35:38 +0530
Subject: [PATCH 06/11] refactor: remove return type declaration from function
 comment

---
 packages/blocks/src/block-manager/index.tsx          |  4 ++--
 packages/blocks/src/blocks/core-audio.tsx            |  4 ++--
 packages/blocks/src/blocks/core-button.tsx           |  6 ++++--
 packages/blocks/src/blocks/core-buttons.tsx          |  4 ++--
 packages/blocks/src/blocks/core-code.tsx             |  6 ++++--
 packages/blocks/src/blocks/core-column.tsx           |  4 ++--
 packages/blocks/src/blocks/core-columns.tsx          |  4 ++--
 packages/blocks/src/blocks/core-cover.tsx            |  6 +++---
 packages/blocks/src/blocks/core-details.tsx          |  4 ++--
 packages/blocks/src/blocks/core-file.tsx             |  4 ++--
 packages/blocks/src/blocks/core-freeform.tsx         |  4 ++--
 packages/blocks/src/blocks/core-gallery.tsx          |  4 ++--
 packages/blocks/src/blocks/core-group.tsx            |  4 ++--
 packages/blocks/src/blocks/core-heading.tsx          |  6 ++++--
 packages/blocks/src/blocks/core-html.tsx             |  6 ++++--
 packages/blocks/src/blocks/core-image.tsx            | 12 ++++++------
 packages/blocks/src/blocks/core-list-item.tsx        |  4 ++--
 packages/blocks/src/blocks/core-list.tsx             |  7 +++++--
 packages/blocks/src/blocks/core-media-text.tsx       |  6 +++---
 packages/blocks/src/blocks/core-paragraph.tsx        |  4 ++--
 packages/blocks/src/blocks/core-pattern.tsx          |  6 ++++--
 packages/blocks/src/blocks/core-post-content.tsx     |  4 ++--
 packages/blocks/src/blocks/core-preformatted.tsx     |  4 ++--
 packages/blocks/src/blocks/core-pullquote.tsx        |  4 ++--
 packages/blocks/src/blocks/core-quote.tsx            |  4 ++--
 packages/blocks/src/blocks/core-separator.tsx        |  4 ++--
 packages/blocks/src/blocks/core-spacer.tsx           |  4 ++--
 packages/blocks/src/blocks/core-template-part.tsx    |  4 ++--
 packages/blocks/src/blocks/core-verse.tsx            |  4 ++--
 packages/blocks/src/blocks/core-video.tsx            |  4 ++--
 packages/blocks/src/blocks/default.tsx               |  6 ++++--
 packages/blocks/src/editor-blocks-renderer/index.tsx |  2 +-
 .../blocks/src/utils/flat-list-to-hierarchical.ts    |  2 +-
 packages/core/src/config/snapwp-config-manager.ts    | 10 +++++-----
 .../src/config/tests/snapwp-config-manager.test.tsx  |  2 +-
 packages/core/src/logger/index.ts                    | 10 +++++-----
 packages/core/src/utils/cn.ts                        |  2 +-
 .../src/utils/find-element-and-get-class-names.ts    |  2 +-
 packages/core/src/utils/generate-graphql-url.ts      |  2 +-
 .../core/src/utils/get-class-names-from-string.ts    |  2 +-
 packages/core/src/utils/get-color-class-name.ts      |  2 +-
 .../core/src/utils/get-image-size-from-attributes.ts |  2 +-
 packages/core/src/utils/get-px-for-size-attribute.ts |  2 +-
 .../core/src/utils/get-spacing-preset-css-var.ts     |  2 +-
 .../core/src/utils/get-style-object-from-string.ts   |  6 +++---
 .../core/src/utils/get-styles-from-attributes.ts     |  2 +-
 packages/core/src/utils/is-valid-url.ts              |  2 +-
 .../core/src/utils/parse-external-remote-patterns.ts |  2 +-
 packages/core/src/utils/replace-host-url.ts          |  2 +-
 packages/core/src/utils/url-slash-modify.ts          |  8 ++++----
 packages/e2e-tests/src/utils/cleanup.ts              |  2 --
 packages/e2e-tests/src/utils/setup-next-app.ts       |  2 --
 packages/e2e-tests/src/utils/setup-snapwp-helper.ts  |  2 --
 packages/e2e-tests/src/utils/setup-wordpress.ts      |  2 --
 packages/e2e-tests/src/utils/start-next-app.ts       |  2 --
 packages/e2e-tests/src/utils/start-proxy-registry.ts |  2 --
 packages/e2e-tests/src/utils/wait-for-server.ts      |  2 --
 packages/next/src/components/default-error.tsx       |  2 +-
 packages/next/src/components/font.tsx                |  2 +-
 packages/next/src/components/image.tsx               |  2 +-
 packages/next/src/components/link.tsx                |  2 +-
 packages/next/src/components/script-module.tsx       |  2 +-
 packages/next/src/components/script.tsx              |  2 +-
 packages/next/src/config/with-snap-wp.ts             |  8 ++++----
 packages/next/src/middleware/cors.ts                 |  2 +-
 packages/next/src/middleware/current-path.ts         |  2 +-
 packages/next/src/middleware/proxies.ts              |  2 +-
 packages/next/src/middleware/utils.ts                |  4 ++--
 packages/next/src/react-parser/index.tsx             |  2 +-
 packages/next/src/react-parser/options.tsx           |  2 +-
 packages/next/src/root-layout/global-head.tsx        |  2 +-
 packages/next/src/root-layout/index.tsx              |  2 +-
 packages/next/src/template-renderer/index.tsx        |  2 +-
 .../next/src/template-renderer/template-head.tsx     |  2 +-
 .../next/src/template-renderer/template-scripts.tsx  |  8 ++++----
 packages/query/src/query-engine/index.ts             |  8 ++++----
 packages/query/src/utils/parse-global-styles.ts      |  2 +-
 packages/query/src/utils/parse-template.ts           | 12 ++++++------
 78 files changed, 151 insertions(+), 150 deletions(-)

diff --git a/packages/blocks/src/block-manager/index.tsx b/packages/blocks/src/block-manager/index.tsx
index 86271521..8099c891 100644
--- a/packages/blocks/src/block-manager/index.tsx
+++ b/packages/blocks/src/block-manager/index.tsx
@@ -27,7 +27,7 @@ export default class BlockManager {
 	 * Function to convert a flat list of blocks to a tree depending on `clientId` and `parentClientId`
 	 * @param blockList - A flat list of blocks.
 	 *
-	 * @return {Array<BlockTreeNode>} A tree of blocks.
+	 * @return A tree of blocks.
 	 */
 	public static flatListToHierarchical(
 		blockList?: BlockData[] | null | undefined
@@ -80,7 +80,7 @@ export default class BlockManager {
 	 * Pre processes a flat list of blocks for rendering.
 	 * @param blockList - A flat list of blocks.
 	 *
-	 * @return {Array<BlockTreeNode>} A tree of blocks with render functions.
+	 * @return A tree of blocks with render functions.
 	 */
 	public static parseBlockForRendering(
 		blockList?: BlockData[] | null | undefined
diff --git a/packages/blocks/src/blocks/core-audio.tsx b/packages/blocks/src/blocks/core-audio.tsx
index 35abbead..c4e7efec 100644
--- a/packages/blocks/src/blocks/core-audio.tsx
+++ b/packages/blocks/src/blocks/core-audio.tsx
@@ -12,12 +12,12 @@ import type { CoreAudio as CoreAudioType, CoreAudioProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered block.
+ * @return The rendered block.
  */
 const CoreAudio: CoreAudioType = ( {
 	attributes,
 	renderedHtml,
-}: CoreAudioProps ) => {
+}: CoreAudioProps ): React.JSX.Element | null => {
 	const { autoplay, caption, loop, preload, src, style } = attributes || {};
 
 	if ( ! src ) {
diff --git a/packages/blocks/src/blocks/core-button.tsx b/packages/blocks/src/blocks/core-button.tsx
index 2ee269ba..f2b05906 100644
--- a/packages/blocks/src/blocks/core-button.tsx
+++ b/packages/blocks/src/blocks/core-button.tsx
@@ -13,9 +13,11 @@ import type {
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
-const CoreButton: CoreButtonType = ( { attributes }: CoreButtonProps ) => {
+const CoreButton: CoreButtonType = ( {
+	attributes,
+}: CoreButtonProps ): React.JSX.Element => {
 	const {
 		buttonType,
 		cssClassName,
diff --git a/packages/blocks/src/blocks/core-buttons.tsx b/packages/blocks/src/blocks/core-buttons.tsx
index 4513c7f1..cc440118 100644
--- a/packages/blocks/src/blocks/core-buttons.tsx
+++ b/packages/blocks/src/blocks/core-buttons.tsx
@@ -11,12 +11,12 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreButtons: CoreButtonsType = ( {
 	attributes,
 	children,
-}: CoreButtonsProps ) => {
+}: CoreButtonsProps ): React.JSX.Element => {
 	const { cssClassName, style } = attributes || {};
 	const classNames = cn( cssClassName );
 
diff --git a/packages/blocks/src/blocks/core-code.tsx b/packages/blocks/src/blocks/core-code.tsx
index 0d8a58ed..d5404d5f 100644
--- a/packages/blocks/src/blocks/core-code.tsx
+++ b/packages/blocks/src/blocks/core-code.tsx
@@ -8,9 +8,11 @@ import type { CoreCode as CoreCodeType, CoreCodeProps } from '@snapwp/types';
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
-const CoreCode: CoreCodeType = ( { attributes }: CoreCodeProps ) => {
+const CoreCode: CoreCodeType = ( {
+	attributes,
+}: CoreCodeProps ): React.JSX.Element => {
 	const { style, cssClassName, content } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-column.tsx b/packages/blocks/src/blocks/core-column.tsx
index 1b1a2b9f..024ec390 100644
--- a/packages/blocks/src/blocks/core-column.tsx
+++ b/packages/blocks/src/blocks/core-column.tsx
@@ -12,12 +12,12 @@ import type { CSSProperties } from 'react';
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreColumn: CoreColumnType = ( {
 	attributes,
 	children,
-}: CoreColumnProps ) => {
+}: CoreColumnProps ): React.JSX.Element => {
 	const { cssClassName, style, width } = attributes || {};
 
 	const classNames = cn( cssClassName );
diff --git a/packages/blocks/src/blocks/core-columns.tsx b/packages/blocks/src/blocks/core-columns.tsx
index 393a7a3c..e65fa1fc 100644
--- a/packages/blocks/src/blocks/core-columns.tsx
+++ b/packages/blocks/src/blocks/core-columns.tsx
@@ -11,12 +11,12 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreColumns: CoreColumnsType = ( {
 	attributes,
 	children,
-}: CoreColumnsProps ) => {
+}: CoreColumnsProps ): React.JSX.Element => {
 	const { cssClassName, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-cover.tsx b/packages/blocks/src/blocks/core-cover.tsx
index 9864471b..21af38d3 100644
--- a/packages/blocks/src/blocks/core-cover.tsx
+++ b/packages/blocks/src/blocks/core-cover.tsx
@@ -23,7 +23,7 @@ const DEFAULT_FOCAL_POINT = { x: 0.5, y: 0.5 };
  *
  * @param focalPoint - The focal point coordinates object containing x and y values.
  *
- * @return {string} CSS position string or undefined if no focal point
+ * @return CSS position string or undefined if no focal point
  */
 const mediaPosition = (
 	focalPoint?: FocalPoint | null | undefined
@@ -45,7 +45,7 @@ const mediaPosition = (
  * @param root0.connectedMediaItem - The connected media item object
  * @param root0.mediaDetails - The media details object
  *
- * @return {React.JSX.Element} The rendered cover block or null if using featured image
+ * @return The rendered cover block or null if using featured image
  */
 const CoreCover: CoreCoverType = ( {
 	attributes,
@@ -53,7 +53,7 @@ const CoreCover: CoreCoverType = ( {
 	mediaDetails,
 	children,
 	renderedHtml,
-}: CoreCoverProps ) => {
+}: CoreCoverProps ): React.JSX.Element => {
 	// Rest of the component implementation remains unchanged
 	const {
 		alt,
diff --git a/packages/blocks/src/blocks/core-details.tsx b/packages/blocks/src/blocks/core-details.tsx
index f9b470ca..c55ba002 100644
--- a/packages/blocks/src/blocks/core-details.tsx
+++ b/packages/blocks/src/blocks/core-details.tsx
@@ -16,13 +16,13 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreDetails: CoreDetailsType = ( {
 	attributes,
 	children,
 	renderedHtml,
-}: CoreDetailsProps ) => {
+}: CoreDetailsProps ): React.JSX.Element => {
 	const { style, showContent, summary } = attributes ?? {};
 	const styleObject = getStylesFromAttributes( { style } );
 
diff --git a/packages/blocks/src/blocks/core-file.tsx b/packages/blocks/src/blocks/core-file.tsx
index b1a8cd2f..66eacc80 100644
--- a/packages/blocks/src/blocks/core-file.tsx
+++ b/packages/blocks/src/blocks/core-file.tsx
@@ -16,12 +16,12 @@ const FALLBACK_ARIA_LABEL = 'PDF embed';
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered block.
+ * @return The rendered block.
  */
 const CoreFile: CoreFileType = ( {
 	attributes,
 	renderedHtml,
-}: CoreFileProps ) => {
+}: CoreFileProps ): React.JSX.Element | null => {
 	const {
 		displayPreview,
 		downloadButtonText,
diff --git a/packages/blocks/src/blocks/core-freeform.tsx b/packages/blocks/src/blocks/core-freeform.tsx
index 9b6a497a..3d5fbdfb 100644
--- a/packages/blocks/src/blocks/core-freeform.tsx
+++ b/packages/blocks/src/blocks/core-freeform.tsx
@@ -10,11 +10,11 @@ import type {
  * @param props - The props for the block component.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered block.
+ * @return The rendered block.
  */
 const CoreFreeform: CoreFreeformType = ( {
 	renderedHtml,
-}: CoreFreeformProps ) => {
+}: CoreFreeformProps ): React.JSX.Element | null => {
 	// @todo `attribues.content` is not populated in GraphQL. Using `renderedHtml` for now.
 	if ( ! renderedHtml ) {
 		return null;
diff --git a/packages/blocks/src/blocks/core-gallery.tsx b/packages/blocks/src/blocks/core-gallery.tsx
index 5a1d6699..726f1533 100644
--- a/packages/blocks/src/blocks/core-gallery.tsx
+++ b/packages/blocks/src/blocks/core-gallery.tsx
@@ -16,13 +16,13 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreGallery: CoreGalleryType = ( {
 	attributes,
 	children,
 	renderedHtml,
-}: CoreGalleryProps ) => {
+}: CoreGalleryProps ): React.JSX.Element => {
 	const { caption, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-group.tsx b/packages/blocks/src/blocks/core-group.tsx
index 902c1405..3334d75e 100644
--- a/packages/blocks/src/blocks/core-group.tsx
+++ b/packages/blocks/src/blocks/core-group.tsx
@@ -19,7 +19,7 @@ import type { CoreGroup as CoreGroupType, CoreGroupProps } from '@snapwp/types';
  * @param props.style - Inline styles.
  * @param props.children - The content to render inside the element.
  *
- * @return {React.JSX.Element} The rendered HTML element or the children if no tag name is provided.
+ * @return The rendered HTML element or the children if no tag name is provided.
  */
 const Tag = ( {
 	name,
@@ -46,7 +46,7 @@ const Tag = ( {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreGroup: CoreGroupType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/core-heading.tsx b/packages/blocks/src/blocks/core-heading.tsx
index 59574eda..a955cac6 100644
--- a/packages/blocks/src/blocks/core-heading.tsx
+++ b/packages/blocks/src/blocks/core-heading.tsx
@@ -12,9 +12,11 @@ import type {
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
-const CoreHeading: CoreHeadingType = ( { attributes }: CoreHeadingProps ) => {
+const CoreHeading: CoreHeadingType = ( {
+	attributes,
+}: CoreHeadingProps ): React.JSX.Element => {
 	const { style, cssClassName, content, level } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-html.tsx b/packages/blocks/src/blocks/core-html.tsx
index 2cafb6cc..f908fd74 100644
--- a/packages/blocks/src/blocks/core-html.tsx
+++ b/packages/blocks/src/blocks/core-html.tsx
@@ -7,9 +7,11 @@ import type { CoreHtml as CoreHtmlType, CoreHtmlProps } from '@snapwp/types';
  * @param props - The props for the block component.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered block.
+ * @return The rendered block.
  */
-const CoreHtml: CoreHtmlType = ( { renderedHtml }: CoreHtmlProps ) => {
+const CoreHtml: CoreHtmlType = ( {
+	renderedHtml,
+}: CoreHtmlProps ): React.JSX.Element | null => {
 	// @todo use attributes.content instead of renderedHtml once it's available
 	if ( ! renderedHtml ) {
 		return null;
diff --git a/packages/blocks/src/blocks/core-image.tsx b/packages/blocks/src/blocks/core-image.tsx
index b72cbca2..caed1dea 100644
--- a/packages/blocks/src/blocks/core-image.tsx
+++ b/packages/blocks/src/blocks/core-image.tsx
@@ -28,7 +28,7 @@ import type {
  * @param [props.rel] - The rel for the link.
  * @param [props.lightbox] - The lightbox attribute.
  *
- * @return {React.JSX.Element} The rendered figure element.
+ * @return The rendered figure element.
  */
 const Figure = ( {
 	children,
@@ -78,7 +78,7 @@ const Figure = ( {
  * @param [props.mediaDetails] - The media details.
  * @param [props.renderedHtml] - The rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered core image block or null if no URL is provided.
+ * @return The rendered core image block or null if no URL is provided.
  */
 const CoreImage: CoreImageType = ( {
 	attributes,
@@ -171,7 +171,7 @@ const CoreImage: CoreImageType = ( {
  * @param [connectedMediaItem] The connected media item.
  * @param [mediaDetails] The media details.
  *
- * @return {Object} The props for the image component.
+ * @return The props for the image component.
  */
 const getImageProps = (
 	attributes?: CoreImageAttributes,
@@ -245,7 +245,7 @@ const getImageProps = (
  *
  * @param lightbox - The lightbox attribute.
  *
- * @return {boolean} Whether the lightbox is enabled.
+ * @return Whether the lightbox is enabled.
  */
 //@ts-ignore -- Stubbed until lightbox support is fixed.
 const isLightboxEnabled = ( lightbox?: string | null ): boolean => {
@@ -266,7 +266,7 @@ const isLightboxEnabled = ( lightbox?: string | null ): boolean => {
  * @param element - The element to extract attributes for.
  * @param renderedHtml - The rendered HTML.
  *
- * @return {Object} The extracted interactivity attributes.
+ * @return The extracted interactivity attributes.
  */
 const extractInteractivityAttributesForElement = (
 	element: string,
@@ -306,7 +306,7 @@ const extractInteractivityAttributesForElement = (
  * @param element - The element to extract attributes for.
  * @param renderedHtml - The rendered HTML.
  *
- * @return {Object} The extracted ARIA attributes.
+ * @return The extracted ARIA attributes.
  */
 const extractAriaAttributesForElement = (
 	element: string,
diff --git a/packages/blocks/src/blocks/core-list-item.tsx b/packages/blocks/src/blocks/core-list-item.tsx
index c32607e6..a5a6f909 100644
--- a/packages/blocks/src/blocks/core-list-item.tsx
+++ b/packages/blocks/src/blocks/core-list-item.tsx
@@ -17,13 +17,13 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreListItem: CoreListItemType = ( {
 	attributes,
 	renderedHtml,
 	children,
-}: CoreListItemProps ) => {
+}: CoreListItemProps ): React.JSX.Element => {
 	const { content, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-list.tsx b/packages/blocks/src/blocks/core-list.tsx
index b0603ee1..5d8f0e67 100644
--- a/packages/blocks/src/blocks/core-list.tsx
+++ b/packages/blocks/src/blocks/core-list.tsx
@@ -9,9 +9,12 @@ import type { CSSProperties } from 'react';
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
-const CoreList: CoreListType = ( { attributes, children }: CoreListProps ) => {
+const CoreList: CoreListType = ( {
+	attributes,
+	children,
+}: CoreListProps ): React.JSX.Element => {
 	const { cssClassName, ordered, reversed, start, style, type } =
 		attributes || {};
 
diff --git a/packages/blocks/src/blocks/core-media-text.tsx b/packages/blocks/src/blocks/core-media-text.tsx
index 77b86fa6..75c5ed2d 100644
--- a/packages/blocks/src/blocks/core-media-text.tsx
+++ b/packages/blocks/src/blocks/core-media-text.tsx
@@ -29,7 +29,7 @@ const DEFAULT_MEDIA_SIZE_SLUG = 'full';
  * @param focalPoint.x - The x-coordinate of the focal point (0 to 1).
  * @param focalPoint.y - The y-coordinate of the focal point (0 to 1).
  *
- * @return {Object} CSS styles for the image fill.
+ * @return CSS styles for the image fill.
  */
 function imageFillStyles(
 	url?: string,
@@ -56,7 +56,7 @@ function imageFillStyles(
  * @param props.connectedMediaItem - Connected media item
  * @param props.mediaDetails - Media details
  *
- * @return {React.JSX.Element} Rendered component or null if no content
+ * @return Rendered component or null if no content
  */
 const CoreMediaText: CoreMediaTextType = ( {
 	attributes = {},
@@ -64,7 +64,7 @@ const CoreMediaText: CoreMediaTextType = ( {
 	renderedHtml,
 	connectedMediaItem,
 	mediaDetails,
-}: CoreMediaTextProps ) => {
+}: CoreMediaTextProps ): React.JSX.Element => {
 	// If there is no media URL or children, render the parsed HTML
 	if ( ! attributes?.mediaUrl && ! children ) {
 		return <Parse html={ renderedHtml || '' } />;
diff --git a/packages/blocks/src/blocks/core-paragraph.tsx b/packages/blocks/src/blocks/core-paragraph.tsx
index 887266ec..72979657 100644
--- a/packages/blocks/src/blocks/core-paragraph.tsx
+++ b/packages/blocks/src/blocks/core-paragraph.tsx
@@ -11,11 +11,11 @@ import type {
  * @param props - The props for the block component.
  * @param props.attributes - Block attributes.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreParagraph: CoreParagraphType = ( {
 	attributes,
-}: CoreParagraphProps ) => {
+}: CoreParagraphProps ): React.JSX.Element => {
 	const {
 		backgroundColor,
 		content,
diff --git a/packages/blocks/src/blocks/core-pattern.tsx b/packages/blocks/src/blocks/core-pattern.tsx
index 52b1a02f..662e4314 100644
--- a/packages/blocks/src/blocks/core-pattern.tsx
+++ b/packages/blocks/src/blocks/core-pattern.tsx
@@ -9,9 +9,11 @@ import type {
  * @param props - The props for the block component.
  * @param props.children - The block's children.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
-const CorePattern: CorePatternType = ( { children }: CorePatternProps ) => {
+const CorePattern: CorePatternType = ( {
+	children,
+}: CorePatternProps ): React.JSX.Element => {
 	// Patterns contain only children, so we just return them.
 	return <>{ children }</>;
 };
diff --git a/packages/blocks/src/blocks/core-post-content.tsx b/packages/blocks/src/blocks/core-post-content.tsx
index 1cc9fc35..e066ebf6 100644
--- a/packages/blocks/src/blocks/core-post-content.tsx
+++ b/packages/blocks/src/blocks/core-post-content.tsx
@@ -11,12 +11,12 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CorePostContent: CorePostContentType = ( {
 	renderedHtml,
 	children,
-}: CorePostContentProps ) => {
+}: CorePostContentProps ): React.JSX.Element => {
 	/**
 	 * @todo replace with cssClassName once it's supported.
 	 */
diff --git a/packages/blocks/src/blocks/core-preformatted.tsx b/packages/blocks/src/blocks/core-preformatted.tsx
index d9fcb859..c329afe0 100644
--- a/packages/blocks/src/blocks/core-preformatted.tsx
+++ b/packages/blocks/src/blocks/core-preformatted.tsx
@@ -16,12 +16,12 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CorePreformatted: CorePreformattedType = ( {
 	attributes,
 	renderedHtml,
-}: CorePreformattedProps ) => {
+}: CorePreformattedProps ): React.JSX.Element => {
 	const { content, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-pullquote.tsx b/packages/blocks/src/blocks/core-pullquote.tsx
index 0021ff33..0e354ecb 100644
--- a/packages/blocks/src/blocks/core-pullquote.tsx
+++ b/packages/blocks/src/blocks/core-pullquote.tsx
@@ -16,12 +16,12 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CorePullquote: CorePullquoteType = ( {
 	attributes,
 	renderedHtml,
-}: CorePullquoteProps ) => {
+}: CorePullquoteProps ): React.JSX.Element => {
 	const { style, pullquoteValue, citation } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-quote.tsx b/packages/blocks/src/blocks/core-quote.tsx
index 4ff9c1d0..173bbb76 100644
--- a/packages/blocks/src/blocks/core-quote.tsx
+++ b/packages/blocks/src/blocks/core-quote.tsx
@@ -9,12 +9,12 @@ import type { CoreQuote as CoreQuoteType, CoreQuoteProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.children - The block's children.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreQuote: CoreQuoteType = ( {
 	attributes,
 	children,
-}: CoreQuoteProps ) => {
+}: CoreQuoteProps ): React.JSX.Element => {
 	const { style, citation, cssClassName } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-separator.tsx b/packages/blocks/src/blocks/core-separator.tsx
index 00f60515..c3acf37f 100644
--- a/packages/blocks/src/blocks/core-separator.tsx
+++ b/packages/blocks/src/blocks/core-separator.tsx
@@ -10,11 +10,11 @@ import type {
  * @param props - The props for the block component.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreSeparator: CoreSeparatorType = ( {
 	renderedHtml,
-}: CoreSeparatorProps ) => {
+}: CoreSeparatorProps ): React.JSX.Element => {
 	const classes = getClassNamesFromString( renderedHtml || '' ).join( ' ' );
 	return <hr className={ classes } />;
 };
diff --git a/packages/blocks/src/blocks/core-spacer.tsx b/packages/blocks/src/blocks/core-spacer.tsx
index 9cef35b0..ca1fecac 100644
--- a/packages/blocks/src/blocks/core-spacer.tsx
+++ b/packages/blocks/src/blocks/core-spacer.tsx
@@ -16,12 +16,12 @@ import type {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreSpacer: CoreSpacerType = ( {
 	attributes,
 	renderedHtml,
-}: CoreSpacerProps ) => {
+}: CoreSpacerProps ): React.JSX.Element => {
 	const { height, width, style } = attributes || {};
 
 	const parsedStyle = style ? JSON.parse( style ) : {};
diff --git a/packages/blocks/src/blocks/core-template-part.tsx b/packages/blocks/src/blocks/core-template-part.tsx
index fd3477f7..91dc9fd0 100644
--- a/packages/blocks/src/blocks/core-template-part.tsx
+++ b/packages/blocks/src/blocks/core-template-part.tsx
@@ -13,13 +13,13 @@ import type {
  * @param props.children - The block's children.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreTemplatePart: CoreTemplatePartType = ( {
 	renderedHtml,
 	children,
 	attributes,
-}: CoreTemplatePartProps ) => {
+}: CoreTemplatePartProps ): React.JSX.Element => {
 	const { templatePartTagName, area } = attributes || {};
 
 	const htmlTag = templatePartTagName || area || 'div';
diff --git a/packages/blocks/src/blocks/core-verse.tsx b/packages/blocks/src/blocks/core-verse.tsx
index ee42c4a9..481c8046 100644
--- a/packages/blocks/src/blocks/core-verse.tsx
+++ b/packages/blocks/src/blocks/core-verse.tsx
@@ -13,12 +13,12 @@ import type { CoreVerse as CoreVerseType, CoreVerseProps } from '@snapwp/types';
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element} The rendered block.
+ * @return The rendered block.
  */
 const CoreVerse: CoreVerseType = ( {
 	attributes,
 	renderedHtml,
-}: CoreVerseProps ) => {
+}: CoreVerseProps ): React.JSX.Element => {
 	const { style, content } = attributes ?? {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-video.tsx b/packages/blocks/src/blocks/core-video.tsx
index 65f5af04..136cc1b9 100644
--- a/packages/blocks/src/blocks/core-video.tsx
+++ b/packages/blocks/src/blocks/core-video.tsx
@@ -16,7 +16,7 @@ import type {
  * @param props - The props for the component.
  * @param props.tracks - An array of track objects containing `src`, `kind`, `srclang`, and `label`.
  *
- * @return {React.JSX.Element|null} A list of `<track>` elements or `null` if no tracks are provided.
+ * @return A list of `<track>` elements or `null` if no tracks are provided.
  */
 const Tracks = ( {
 	tracks,
@@ -48,7 +48,7 @@ const Tracks = ( {
  * @param props.attributes - Block attributes.
  * @param props.renderedHtml - The block's rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered block.
+ * @return The rendered block.
  */
 const CoreVideo: CoreVideoType = ( {
 	attributes,
diff --git a/packages/blocks/src/blocks/default.tsx b/packages/blocks/src/blocks/default.tsx
index 7b8114bb..65964c95 100644
--- a/packages/blocks/src/blocks/default.tsx
+++ b/packages/blocks/src/blocks/default.tsx
@@ -6,9 +6,11 @@ import type { Default as DefaultType, DefaultProps } from '@snapwp/types';
  * @param props - The props for the component.
  * @param props.renderedHtml - The rendered HTML.
  *
- * @return {React.JSX.Element|null} The rendered default block.
+ * @return The rendered default block.
  */
-const Default: DefaultType = ( { renderedHtml }: DefaultProps ) => {
+const Default: DefaultType = ( {
+	renderedHtml,
+}: DefaultProps ): React.JSX.Element | null => {
 	if ( ! renderedHtml ) {
 		return null;
 	}
diff --git a/packages/blocks/src/editor-blocks-renderer/index.tsx b/packages/blocks/src/editor-blocks-renderer/index.tsx
index 194c1c7e..2e89468f 100644
--- a/packages/blocks/src/editor-blocks-renderer/index.tsx
+++ b/packages/blocks/src/editor-blocks-renderer/index.tsx
@@ -14,7 +14,7 @@ type EditorBlocksRendererProps = {
  * @param props.editorBlocks - A list of blocks to be rendered.
  * @param props.blockDefinitions - Blocks rendering functions.
  *
- * @return {Array<React.JSX.Element>} The rendered template.
+ * @return The rendered template.
  */
 export default function EditorBlocksRenderer( {
 	editorBlocks,
diff --git a/packages/blocks/src/utils/flat-list-to-hierarchical.ts b/packages/blocks/src/utils/flat-list-to-hierarchical.ts
index 29ec7447..6a77c1f2 100644
--- a/packages/blocks/src/utils/flat-list-to-hierarchical.ts
+++ b/packages/blocks/src/utils/flat-list-to-hierarchical.ts
@@ -15,7 +15,7 @@ type Data = Record< string | number, unknown >;
  * @param options.parentKey The key for the parent identifier.
  * @param options.childrenKey The key for the children.
  *
- * @return {Array<Data>} Data Array
+ * @return Data Array.
  */
 export default function flatListToHierarchical(
 	data: Data[] = [],
diff --git a/packages/core/src/config/snapwp-config-manager.ts b/packages/core/src/config/snapwp-config-manager.ts
index 38166a82..38582ebe 100644
--- a/packages/core/src/config/snapwp-config-manager.ts
+++ b/packages/core/src/config/snapwp-config-manager.ts
@@ -76,7 +76,7 @@ const defaultConfig: Partial< SnapWPEnv & SnapWPConfig > = {
  *
  * This is a function (instead of a constant) so we can inject the variables in Jest.
  *
- * @return {Partial<SnapWPEnv>} The configuration object.
+ * @return The configuration object.
  */
 // @ts-ignore - ignore check for nextUrl,homeUrl to run missing environment variable test.
 const envConfig = (): Partial< SnapWPEnv > => ( {
@@ -222,7 +222,7 @@ class SnapWPConfigManager {
 	 *
 	 * @param cfg The configuration to normalize.
 	 *
-	 * @return {Partial<Type>} The normalized configuration.
+	 * @return The normalized configuration.
 	 */
 	static normalizeConfig = < T >( cfg: Partial< T > ): Partial< T > => {
 		// Removing empty values.
@@ -250,7 +250,7 @@ class SnapWPConfigManager {
 	/**
 	 * Get the configuration.
 	 *
-	 * @return {SnapWPConfig|SnapWPEnv} The resolved configuration.
+	 * @return The resolved configuration.
 	 */
 	static getConfig(): Readonly< SnapWPConfig & SnapWPEnv > {
 		if ( ! SnapWPConfigManager.configsSet ) {
@@ -305,7 +305,7 @@ class SnapWPConfigManager {
 	 * @param config The configuration to validate.
 	 * @param schema The schema to validate the configuration against.
 	 *
-	 * @return {Partial<Type>} The resolved configuration.
+	 * @return The resolved configuration.
 	 *
 	 * @throws {Error} If the configuration is invalid.
 	 */
@@ -366,7 +366,7 @@ class SnapWPConfigManager {
 	/**
 	 * Get the GraphQL URL.
 	 *
-	 * @return {string} The GraphQL URL.
+	 * @return The GraphQL URL.
 	 */
 	static getGraphqlUrl(): string {
 		return generateGraphqlUrl(
diff --git a/packages/core/src/config/tests/snapwp-config-manager.test.tsx b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
index b6ae408a..ec1c0fc7 100644
--- a/packages/core/src/config/tests/snapwp-config-manager.test.tsx
+++ b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
@@ -11,7 +11,7 @@ const SnapWPConfigManager = _private.SnapWPConfigManager!;
 /**
  * A mock React component used for testing block definitions.
  *
- * @return {React.JSX.Element} A div containing "Test Block".
+ * @return A div containing "Test Block".
  */
 const MockBlockComponent = (): React.JSX.Element => <div>Test Block</div>;
 
diff --git a/packages/core/src/logger/index.ts b/packages/core/src/logger/index.ts
index 8cfda9f9..4cb268e2 100644
--- a/packages/core/src/logger/index.ts
+++ b/packages/core/src/logger/index.ts
@@ -60,7 +60,7 @@ class Logger {
 	 *
 	 * @example Logger.debug("This is a debug message.")
 	 *
-	 * @return {void}
+	 * @return void
 	 */
 	static debug = ( ...args: unknown[] ): void =>
 		log( LOGTYPE.DEBUG, ...args );
@@ -72,7 +72,7 @@ class Logger {
 	 *
 	 * @example Logger.info("This is an info message.")
 	 *
-	 * @return {void}
+	 * @return void
 	 */
 	static info = ( ...args: unknown[] ): void => log( LOGTYPE.INFO, ...args );
 
@@ -83,7 +83,7 @@ class Logger {
 	 *
 	 * @example Logger.warn("You should do/change something.")
 	 *
-	 * @return {void}
+	 * @return void
 	 */
 	static warn = ( ...args: unknown[] ): void => log( LOGTYPE.WARN, ...args );
 
@@ -94,7 +94,7 @@ class Logger {
 	 *
 	 * @example Logger.error("An error occurred.")
 	 *
-	 * @return {void}
+	 * @return void
 	 */
 	static error = ( ...args: unknown[] ): void =>
 		log( LOGTYPE.ERROR, ...args );
@@ -106,7 +106,7 @@ class Logger {
 	 *
 	 * @example Logger.log("This is a message.")
 	 *
-	 * @return {void}
+	 * @return void
 	 */
 	static log = ( ...args: unknown[] ): void => log( LOGTYPE.LOG, ...args );
 }
diff --git a/packages/core/src/utils/cn.ts b/packages/core/src/utils/cn.ts
index 2ee88084..5b014b09 100644
--- a/packages/core/src/utils/cn.ts
+++ b/packages/core/src/utils/cn.ts
@@ -5,7 +5,7 @@ import { type ClassValue, clsx } from 'clsx';
  *
  * @param  inputs - Class names or objects to combine.
  *
- * @return {string} Joined class names.
+ * @return Joined class names.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/find-element-and-get-class-names.ts b/packages/core/src/utils/find-element-and-get-class-names.ts
index 8c886985..25051dd0 100644
--- a/packages/core/src/utils/find-element-and-get-class-names.ts
+++ b/packages/core/src/utils/find-element-and-get-class-names.ts
@@ -6,7 +6,7 @@ import { getClassNamesFromString, cn } from '@/utils';
  * @param renderedHtml - The rendered HTML string.
  * @param elementSelector - The element selector (class, id, or tag name) If selector is not provided then it will select the first element and will return it's classNames.
  *
- * @return {string} The extracted class names from the first occurrence of the specified element or an empty string if the element is not found.
+ * @return The extracted class names from the first occurrence of the specified element or an empty string if the element is not found.
  */
 export default function findElementAndGetClassNames(
 	renderedHtml?: string | null | undefined,
diff --git a/packages/core/src/utils/generate-graphql-url.ts b/packages/core/src/utils/generate-graphql-url.ts
index a06da885..07c45d24 100644
--- a/packages/core/src/utils/generate-graphql-url.ts
+++ b/packages/core/src/utils/generate-graphql-url.ts
@@ -6,7 +6,7 @@ import { Logger } from '@/logger';
  * @param homeUrl The home URL.
  * @param graphqlEndpoint The GraphQL endpoint.
  *
- * @return {string} The complete GraphQL URL.
+ * @return The complete GraphQL URL.
  */
 export default function generateGraphqlUrl(
 	homeUrl?: string,
diff --git a/packages/core/src/utils/get-class-names-from-string.ts b/packages/core/src/utils/get-class-names-from-string.ts
index 1a028bac..c0534f7e 100644
--- a/packages/core/src/utils/get-class-names-from-string.ts
+++ b/packages/core/src/utils/get-class-names-from-string.ts
@@ -3,7 +3,7 @@
  *
  * @param html - The HTML string to parse.
  *
- * @return {Array<string>} An array of class names.
+ * @return An array of class names.
  */
 export default function getClassNamesFromString( html: string ): string[] {
 	// Match the first occurrence of the class attribute
diff --git a/packages/core/src/utils/get-color-class-name.ts b/packages/core/src/utils/get-color-class-name.ts
index 95c334c8..d7adbba5 100644
--- a/packages/core/src/utils/get-color-class-name.ts
+++ b/packages/core/src/utils/get-color-class-name.ts
@@ -4,7 +4,7 @@
  * @param colorContextName - The context name for the color (e.g., 'background', 'text').
  * @param colorSlug - The slug for the color (e.g., 'primary', 'secondary').
  *
- * @return {string|undefined} The generated CSS class name or undefined if parameters are missing.
+ * @return The generated CSS class name or undefined if parameters are missing.
  */
 export default function getColorClassName(
 	colorContextName?: string | undefined,
diff --git a/packages/core/src/utils/get-image-size-from-attributes.ts b/packages/core/src/utils/get-image-size-from-attributes.ts
index c4502fb4..35928cbd 100644
--- a/packages/core/src/utils/get-image-size-from-attributes.ts
+++ b/packages/core/src/utils/get-image-size-from-attributes.ts
@@ -32,7 +32,7 @@ const imageSizeToHeight: {
  *
  * @param attributes - Image size attributes including sizeSlug, width, and height.
  *
- * @return {Object} An object containing the width and height in pixels.
+ * @return An object containing the width and height in pixels.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/get-px-for-size-attribute.ts b/packages/core/src/utils/get-px-for-size-attribute.ts
index 270c91ff..9ee6ae85 100644
--- a/packages/core/src/utils/get-px-for-size-attribute.ts
+++ b/packages/core/src/utils/get-px-for-size-attribute.ts
@@ -3,7 +3,7 @@
  *
  * @param sizeAttribute - The size attribute string (e.g., "10em", "50%").
  *
- * @return {number} The size in pixels.
+ * @return The size in pixels.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/get-spacing-preset-css-var.ts b/packages/core/src/utils/get-spacing-preset-css-var.ts
index c02031d5..f0c4a254 100644
--- a/packages/core/src/utils/get-spacing-preset-css-var.ts
+++ b/packages/core/src/utils/get-spacing-preset-css-var.ts
@@ -5,7 +5,7 @@
  *
  * @param value Value to convert.
  *
- * @return {string|undefined} CSS var string for given spacing preset value.
+ * @return CSS var string for given spacing preset value.
  */
 export default function getSpacingPresetCssVar(
 	value: string | null | undefined
diff --git a/packages/core/src/utils/get-style-object-from-string.ts b/packages/core/src/utils/get-style-object-from-string.ts
index 3282f38a..71b199a0 100644
--- a/packages/core/src/utils/get-style-object-from-string.ts
+++ b/packages/core/src/utils/get-style-object-from-string.ts
@@ -6,7 +6,7 @@ import { Logger } from '@/logger';
  *
  * @param str - The input string.
  *
- * @return {string} The camelcased string.
+ * @return The camelcased string.
  *
  * @internal
  */
@@ -33,7 +33,7 @@ function formatStringToCamelCase( str: string ): string {
  *
  * @param str - The CSS string.
  *
- * @return {CSSProperties} The style object.
+ * @return The style object.
  */
 function cssToReactStyle( str: string ): CSSProperties {
 	const style: { [ key: string ]: string } = {}; // add index signature here
@@ -58,7 +58,7 @@ function cssToReactStyle( str: string ): CSSProperties {
  *
  * @param css - The CSS string.
  *
- * @return {CSSProperties} The style object.
+ * @return The style object.
  */
 export default function getStyleObjectFromString(
 	css: object | string
diff --git a/packages/core/src/utils/get-styles-from-attributes.ts b/packages/core/src/utils/get-styles-from-attributes.ts
index 479aa1e1..07a57fc9 100644
--- a/packages/core/src/utils/get-styles-from-attributes.ts
+++ b/packages/core/src/utils/get-styles-from-attributes.ts
@@ -12,7 +12,7 @@ interface AttributesWithStyle {
  * @param attributes - Object containing a style string.
  * @param attributes.style - The style string to compile.
  *
- * @return {CSSProperties} Compiled styles as an object or an empty object if no styles exist.
+ * @return Compiled styles as an object or an empty object if no styles exist.
  */
 export default function getStylesFromAttributes( {
 	style,
diff --git a/packages/core/src/utils/is-valid-url.ts b/packages/core/src/utils/is-valid-url.ts
index c0698ace..148aa939 100644
--- a/packages/core/src/utils/is-valid-url.ts
+++ b/packages/core/src/utils/is-valid-url.ts
@@ -1,7 +1,7 @@
 /**
  * @param str A string to be validated as a Url.
  *
- * @return {boolean} flag signifying validity.
+ * @return flag signifying validity.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/parse-external-remote-patterns.ts b/packages/core/src/utils/parse-external-remote-patterns.ts
index b7f3542e..ab73daca 100644
--- a/packages/core/src/utils/parse-external-remote-patterns.ts
+++ b/packages/core/src/utils/parse-external-remote-patterns.ts
@@ -2,7 +2,7 @@
  * Parses given string into remote patterns.
  * @param str URLs for external image sources in a comma seperated fashion.
  *
- * @return {Array<Object>} an array of remote patterns to be used in next.config.js
+ * @return an array of remote patterns to be used in next.config.js
  *
  * @internal
  */
diff --git a/packages/core/src/utils/replace-host-url.ts b/packages/core/src/utils/replace-host-url.ts
index cb930906..a352bcd2 100644
--- a/packages/core/src/utils/replace-host-url.ts
+++ b/packages/core/src/utils/replace-host-url.ts
@@ -5,7 +5,7 @@
  * @param hostUrl - Host url to be replaced.
  * @param newHostUrl - Host url to be replaced with.
  *
- * @return {string} The internal url.
+ * @return The internal url.
  *
  * @internal
  */
diff --git a/packages/core/src/utils/url-slash-modify.ts b/packages/core/src/utils/url-slash-modify.ts
index 14d5f6cf..c0f6ff07 100644
--- a/packages/core/src/utils/url-slash-modify.ts
+++ b/packages/core/src/utils/url-slash-modify.ts
@@ -3,7 +3,7 @@
  *
  * @param url The URL to modify.
  *
- * @return {string} The modified URL.
+ * @return The modified URL.
  *
  * @internal
  */
@@ -16,7 +16,7 @@ export function removeTrailingSlash( url: string ): string {
  *
  * @param url The URL to modify.
  *
- * @return {string} The modified URL.
+ * @return The modified URL.
  *
  * @internal
  */
@@ -29,7 +29,7 @@ export function addTrailingSlash( url: string ): string {
  *
  * @param url The URL to modify.
  *
- * @return {string} The modified URL.
+ * @return The modified URL.
  *
  * @internal
  */
@@ -42,7 +42,7 @@ export function removeLeadingSlash( url: string ): string {
  *
  * @param url The URL to modify.
  *
- * @return {string} The modified URL.
+ * @return The modified URL.
  *
  * @internal
  */
diff --git a/packages/e2e-tests/src/utils/cleanup.ts b/packages/e2e-tests/src/utils/cleanup.ts
index 5e063e61..00bbe09c 100644
--- a/packages/e2e-tests/src/utils/cleanup.ts
+++ b/packages/e2e-tests/src/utils/cleanup.ts
@@ -7,8 +7,6 @@ import { execSync } from 'child_process';
  *
  * - Stops Next.js, WordPress (`wp-env`), and the local registry.
  * - Deletes `snapwp-helper` and `test-app` directories if they exist.
- *
- * @return {void}
  */
 export default function cleanup(): void {
 	try {
diff --git a/packages/e2e-tests/src/utils/setup-next-app.ts b/packages/e2e-tests/src/utils/setup-next-app.ts
index 7bc060dc..23c7a4b6 100644
--- a/packages/e2e-tests/src/utils/setup-next-app.ts
+++ b/packages/e2e-tests/src/utils/setup-next-app.ts
@@ -6,8 +6,6 @@ import startProxyRegistry from './start-proxy-registry';
 /**
  * Sets up the Next.js app by creating a test directory, writing environment variables,
  * and running the SnapWP setup.
- *
- * @return {Promise<void>}
  */
 export default async function setupNextApp(): Promise< void > {
 	const testAppDir = path.join( process.cwd(), 'test-app' );
diff --git a/packages/e2e-tests/src/utils/setup-snapwp-helper.ts b/packages/e2e-tests/src/utils/setup-snapwp-helper.ts
index a057d661..0e11567d 100644
--- a/packages/e2e-tests/src/utils/setup-snapwp-helper.ts
+++ b/packages/e2e-tests/src/utils/setup-snapwp-helper.ts
@@ -5,8 +5,6 @@ import path from 'path';
  * Clones the SnapWP Helper plugin, installs dependencies, and builds it.
  *
  * @throws If any command fails, an error is logged and rethrown.
- *
- * @return {void}
  */
 export default function setupSnapWPHelper(): void {
 	const pluginPath = path.join( process.cwd(), 'snapwp-helper' );
diff --git a/packages/e2e-tests/src/utils/setup-wordpress.ts b/packages/e2e-tests/src/utils/setup-wordpress.ts
index 49473d16..f4ef6a57 100644
--- a/packages/e2e-tests/src/utils/setup-wordpress.ts
+++ b/packages/e2e-tests/src/utils/setup-wordpress.ts
@@ -5,8 +5,6 @@ import setupSnapWPHelper from './setup-snapwp-helper';
 /**
  * Sets up the WordPress environment by starting the server,
  * waiting for it to be available, and configuring permalinks.
- *
- * @return {Promise<void>}
  */
 export default async function setupWordPress(): Promise< void > {
 	console.log( 'Starting WordPress environment...' );
diff --git a/packages/e2e-tests/src/utils/start-next-app.ts b/packages/e2e-tests/src/utils/start-next-app.ts
index b670f868..5bb9f989 100644
--- a/packages/e2e-tests/src/utils/start-next-app.ts
+++ b/packages/e2e-tests/src/utils/start-next-app.ts
@@ -4,8 +4,6 @@ import waitForServer from './wait-for-server';
 
 /**
  * Starts the Next.js app by installing dependencies, building the project, and running the server.
- *
- * @return {Promise<void>}
  */
 export default async function startNextApp(): Promise< void > {
 	console.log( 'Starting Next.js app...' );
diff --git a/packages/e2e-tests/src/utils/start-proxy-registry.ts b/packages/e2e-tests/src/utils/start-proxy-registry.ts
index 904f29c7..6fdd5206 100644
--- a/packages/e2e-tests/src/utils/start-proxy-registry.ts
+++ b/packages/e2e-tests/src/utils/start-proxy-registry.ts
@@ -4,8 +4,6 @@ import { execSync } from 'child_process';
  * Starts the local proxy registry by running the `publish:local` script.
  *
  * @throws If the command fails, an error is logged and rethrown.
- *
- * @return {void}
  */
 export default function startProxyRegistry(): void {
 	try {
diff --git a/packages/e2e-tests/src/utils/wait-for-server.ts b/packages/e2e-tests/src/utils/wait-for-server.ts
index 535ec4ce..012dc177 100644
--- a/packages/e2e-tests/src/utils/wait-for-server.ts
+++ b/packages/e2e-tests/src/utils/wait-for-server.ts
@@ -5,8 +5,6 @@
  * @param timeout - Max wait time per attempt in ms.
  * @param retries - Number of retry attempts (default: 5).
  * @throws If the server doesn't respond after all retries.
- *
- * @return {Promise<void>}
  */
 export default async function waitForServer(
 	url: string,
diff --git a/packages/next/src/components/default-error.tsx b/packages/next/src/components/default-error.tsx
index 9c8d4c3b..a0f49009 100644
--- a/packages/next/src/components/default-error.tsx
+++ b/packages/next/src/components/default-error.tsx
@@ -10,7 +10,7 @@
  * @param root0.error - The error.
  * @param root0.reset - The reset function.
  *
- * @return {React.JSX.Element} The default error component.
+ * @return The default error component.
  */
 export default function DefaultError( {
 	error,
diff --git a/packages/next/src/components/font.tsx b/packages/next/src/components/font.tsx
index 7f09f34d..341b60f2 100644
--- a/packages/next/src/components/font.tsx
+++ b/packages/next/src/components/font.tsx
@@ -4,7 +4,7 @@
  * @param props - Props for the Font component.
  * @param props.renderedFontFaces - Font face data as a string.
  *
- * @return {React.JSX.Element} A style tag with the rendered font faces.
+ * @return A style tag with the rendered font faces.
  *
  * @todo Implement next/font once a solution for handling literal types is determined.
  */
diff --git a/packages/next/src/components/image.tsx b/packages/next/src/components/image.tsx
index 44442ff8..f667bef2 100644
--- a/packages/next/src/components/image.tsx
+++ b/packages/next/src/components/image.tsx
@@ -46,7 +46,7 @@ interface ImageInterface {
  * @param props.fill - If true, fills the container.
  * @param props.src - Source URL for the image.
  *
- * @return {React.JSX.Element|null} The rendered image.
+ * @return The rendered image.
  */
 export default function Image( {
 	alt,
diff --git a/packages/next/src/components/link.tsx b/packages/next/src/components/link.tsx
index d43fc565..b3ae6406 100644
--- a/packages/next/src/components/link.tsx
+++ b/packages/next/src/components/link.tsx
@@ -23,7 +23,7 @@ interface LinkInterface {
  * @param props.className - CSS class name.
  * @param props.children - Block's Children.
  *
- * @return {React.JSX.Element} The rendered link.
+ * @return The rendered link.
  */
 export default function Link( {
 	href,
diff --git a/packages/next/src/components/script-module.tsx b/packages/next/src/components/script-module.tsx
index d755cc21..15bb6be1 100644
--- a/packages/next/src/components/script-module.tsx
+++ b/packages/next/src/components/script-module.tsx
@@ -34,7 +34,7 @@ interface ScriptModuleInterface {
  * @param props.extraData - Additional data required by the script module
  * @param props.dependencies - Dependencies required by the script module
  *
- * @return {React.JSX.Element} The rendered script module elements
+ * @return The rendered script module elements
  */
 export default function ScriptModule( {
 	handle,
diff --git a/packages/next/src/components/script.tsx b/packages/next/src/components/script.tsx
index 2a05ff4a..b1a131ae 100644
--- a/packages/next/src/components/script.tsx
+++ b/packages/next/src/components/script.tsx
@@ -23,7 +23,7 @@ interface ScriptInterface {
  * @param props.groupLocation - The location where the script should be loaded.
  * @param props.src - The source URL for the script.
  *
- * @return {React.JSX.Element} The rendered script element.
+ * @return The rendered script element.
  */
 export default function Script( {
 	after,
diff --git a/packages/next/src/config/with-snap-wp.ts b/packages/next/src/config/with-snap-wp.ts
index e398dd24..ec96b8b2 100644
--- a/packages/next/src/config/with-snap-wp.ts
+++ b/packages/next/src/config/with-snap-wp.ts
@@ -14,7 +14,7 @@ import {
  *
  * @param snapWPConfigPath The path to the SnapWP configuration file.
  *
- * @return {(config: any) => any} A function that modifies the webpack configuration.
+ * @return A function that modifies the webpack configuration.
  */
 const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 	/**
@@ -23,7 +23,7 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 	 * @param config The webpack configuration. Using `any` type as the parameter type is `any` in Next.js.
 	 * @see node_modules/next/dist/server/config-shared.js:169
 	 *
-	 * @return {any} The modified webpack configuration.
+	 * @return The modified webpack configuration.
 	 */
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Using `any` type as the parameter type is `any` in Next.js.
 	return ( config: any ): any => {
@@ -40,7 +40,7 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
 						 *
 						 * @param normalModule The normal module being processed.
 						 *
-						 * @return {boolean} `true` if the module should be modified, otherwise `false`.
+						 * @return `true` if the module should be modified, otherwise `false`.
 						 */
 						test: ( normalModule ): boolean => {
 							const userRequest = normalModule.userRequest || '';
@@ -79,7 +79,7 @@ const modifyWebpackConfig = ( snapWPConfigPath: string ) => {
  *
  * @param nextConfig The Next.js configuration object.
  *
- * @return {Promise<NextConfig>} The extended configuration object.
+ * @return The extended configuration object.
  */
 const withSnapWP = async ( nextConfig: NextConfig ): Promise< NextConfig > => {
 	const possibleSnapWPConfigPaths = [
diff --git a/packages/next/src/middleware/cors.ts b/packages/next/src/middleware/cors.ts
index fdbb6fd6..dd20985d 100644
--- a/packages/next/src/middleware/cors.ts
+++ b/packages/next/src/middleware/cors.ts
@@ -17,7 +17,7 @@ import { Logger } from '@snapwp/core';
  *
  * @param  next - Next middleware
  *
- * @return {(request:NextRequest, _next:NextFetchEvent) => Promise<Response|void|undefined|null>} The response object with modified headers.
+ * @return The response object with modified headers.
  */
 export const corsProxyMiddleware: MiddlewareFactory = (
 	next: NextMiddleware
diff --git a/packages/next/src/middleware/current-path.ts b/packages/next/src/middleware/current-path.ts
index f5c660ea..9e203e07 100644
--- a/packages/next/src/middleware/current-path.ts
+++ b/packages/next/src/middleware/current-path.ts
@@ -9,7 +9,7 @@ import type { MiddlewareFactory } from './utils';
  *
  * @param  next - Next middleware
  *
- * @return {(request:NextRequest, _next:NextFetchEvent) => Promise<Response|void|undefined|null>} The response object with modified headers
+ * @return The response object with modified headers
  */
 export const currentPath: MiddlewareFactory = ( next: NextMiddleware ) => {
 	return async ( request: NextRequest, _next: NextFetchEvent ) => {
diff --git a/packages/next/src/middleware/proxies.ts b/packages/next/src/middleware/proxies.ts
index 677a746b..958ab2c7 100644
--- a/packages/next/src/middleware/proxies.ts
+++ b/packages/next/src/middleware/proxies.ts
@@ -15,7 +15,7 @@ import type { MiddlewareFactory } from './utils';
  *
  * @param  next - Next middleware
  *
- * @return {(request:NextRequest, _next:NextFetchEvent) => Promise<Response|void|undefined|null>} Custom redirection or NextMiddleware.
+ * @return Custom redirection or NextMiddleware.
  */
 export const proxies: MiddlewareFactory = ( next: NextMiddleware ) => {
 	return async ( request: NextRequest, _next: NextFetchEvent ) => {
diff --git a/packages/next/src/middleware/utils.ts b/packages/next/src/middleware/utils.ts
index c6460c06..2cbd790e 100644
--- a/packages/next/src/middleware/utils.ts
+++ b/packages/next/src/middleware/utils.ts
@@ -17,7 +17,7 @@ export type MiddlewareFactory = (
  * @param stackDefaultMiddlewares Weather to add load default middlewares with custom ones.
  *                                Pass false to skip loading default middlewares.
  *
- * @return {NextMiddleware} NextJS Middleware.
+ * @return NextJS Middleware.
  */
 export function appMiddlewares(
 	functions: MiddlewareFactory[] = [],
@@ -45,7 +45,7 @@ export function appMiddlewares(
  *
  * @param middlewares Array containing user defined Middlewares.
  *
- * @return {Array<MiddlewareFactory>} Array combining default middlewares and custom middlewares.
+ * @return Array combining default middlewares and custom middlewares.
  */
 export function stackMiddlewares(
 	middlewares: MiddlewareFactory[] = []
diff --git a/packages/next/src/react-parser/index.tsx b/packages/next/src/react-parser/index.tsx
index ed0e9d09..476ee384 100644
--- a/packages/next/src/react-parser/index.tsx
+++ b/packages/next/src/react-parser/index.tsx
@@ -8,7 +8,7 @@ import type { HTMLReactParserOptions } from 'html-react-parser';
  * @param props - The props for the parser.
  * @param props.html - The HTML string to parse and render.
  *
- * @return {React.JSX.Element} The rendered React components.
+ * @return The rendered React components.
  */
 export default function Parse( { html }: { html: string } ): React.JSX.Element {
 	const {
diff --git a/packages/next/src/react-parser/options.tsx b/packages/next/src/react-parser/options.tsx
index c63f023e..d07dfcde 100644
--- a/packages/next/src/react-parser/options.tsx
+++ b/packages/next/src/react-parser/options.tsx
@@ -17,7 +17,7 @@ export const defaultOptions: HTMLReactParserOptions = {
 	 *
 	 * @param domNode - The DOM node being processed.
 	 *
-	 * @return {React.JSX.Element|undefined} A React element if the node is an anchor tag, otherwise undefined.
+	 * @return A React element if the node is an anchor tag, otherwise undefined.
 	 */
 	replace: ( domNode ) => {
 		if ( domNode instanceof Element ) {
diff --git a/packages/next/src/root-layout/global-head.tsx b/packages/next/src/root-layout/global-head.tsx
index 46675306..451a9fff 100644
--- a/packages/next/src/root-layout/global-head.tsx
+++ b/packages/next/src/root-layout/global-head.tsx
@@ -10,7 +10,7 @@ import { type GlobalHeadProps } from '@snapwp/core';
  * @param props.globalStylesheet - Global stylesheet for the page.
  * @param props.renderedFontFaces - Font faces rendered locally.
  *
- * @return {React.JSX.Element} A head element containing the provided styles and links.
+ * @return A head element containing the provided styles and links.
  */
 export function GlobalHead( {
 	customCss,
diff --git a/packages/next/src/root-layout/index.tsx b/packages/next/src/root-layout/index.tsx
index 659bfb3f..9a6d3f5c 100644
--- a/packages/next/src/root-layout/index.tsx
+++ b/packages/next/src/root-layout/index.tsx
@@ -14,7 +14,7 @@ export type RootLayoutProps = {
  * @param props.getGlobalStyles - A async callback to get global styles.
  * @param props.children - Child components.
  *
- * @return {Promise<React.JSX.Element>} The rendered template.
+ * @return The rendered template.
  */
 export async function RootLayout( {
 	getGlobalStyles = QueryEngine.getGlobalStyles,
diff --git a/packages/next/src/template-renderer/index.tsx b/packages/next/src/template-renderer/index.tsx
index f2fe20ce..a73aae98 100644
--- a/packages/next/src/template-renderer/index.tsx
+++ b/packages/next/src/template-renderer/index.tsx
@@ -19,7 +19,7 @@ export type TemplateRendererProps = {
  * @param props.getTemplateData - A async callback to get template styles and content.
  * @param props.children - The block content to render.
  *
- * @return {React.JSX.Element} A complete HTML document structure.
+ * @return A complete HTML document structure.
  */
 export async function TemplateRenderer( {
 	getTemplateData = QueryEngine.getTemplateData,
diff --git a/packages/next/src/template-renderer/template-head.tsx b/packages/next/src/template-renderer/template-head.tsx
index aa1abe36..047acf4a 100644
--- a/packages/next/src/template-renderer/template-head.tsx
+++ b/packages/next/src/template-renderer/template-head.tsx
@@ -11,7 +11,7 @@ export interface TemplateHeadProps {
  * @param props - The props for the component.
  * @param props.stylesheets - An array of additional stylesheets and inline styles.
  *
- * @return {Array<React.JSX.Element>|null} A head element containing the provided styles and links.
+ * @return A head element containing the provided styles and links.
  */
 export function TemplateHead( {
 	stylesheets,
diff --git a/packages/next/src/template-renderer/template-scripts.tsx b/packages/next/src/template-renderer/template-scripts.tsx
index d86917d0..67d754bc 100644
--- a/packages/next/src/template-renderer/template-scripts.tsx
+++ b/packages/next/src/template-renderer/template-scripts.tsx
@@ -11,7 +11,7 @@ import { getConfig } from '@snapwp/core/config';
  * @param props - The props for the component.
  * @param props.scripts - Array of script objects to be rendered.
  *
- * @return {React.JSX.Element} A collection of `<Script />` components.
+ * @return A collection of `<Script />` components.
  */
 const ScriptMap = ( {
 	scripts,
@@ -37,7 +37,7 @@ const ScriptMap = ( {
  * @param props - The props for the component.
  * @param props.scriptModules - Array of script module objects to generate import map from.
  *
- * @return {React.JSX.Element|null} A Script component containing the import map if dependencies exist.
+ * @return A Script component containing the import map if dependencies exist.
  */
 const ImportMap = ( {
 	scriptModules,
@@ -86,7 +86,7 @@ const ImportMap = ( {
  * @param props - The props for the component.
  * @param props.scriptModules - Array of script module objects to be rendered.
  *
- * @return {React.JSX.Element|null} A collection of `<ScriptModule />` components.
+ * @return A collection of `<ScriptModule />` components.
  */
 const ScriptModuleMap = ( {
 	scriptModules,
@@ -169,7 +169,7 @@ const ScriptModuleMap = ( {
  * @param props.children - The children elements to be rendered.
  * @param props.scriptModules - Array of script module objects to be included in the page.
  *
- * @return {React.JSX.Element} A collection of script elements.
+ * @return A collection of script elements.
  */
 export function TemplateScripts( {
 	children,
diff --git a/packages/query/src/query-engine/index.ts b/packages/query/src/query-engine/index.ts
index 7357c09e..28c3371d 100644
--- a/packages/query/src/query-engine/index.ts
+++ b/packages/query/src/query-engine/index.ts
@@ -54,7 +54,7 @@ export class QueryEngine {
 	 * Returns the singleton instance of QueryEngine.
 	 * @throws Throws error if instance is not initialized with config.
 	 *
-	 * @return {QueryEngine} The QueryEngine instance.
+	 * @return The QueryEngine instance.
 	 */
 	public static getInstance(): QueryEngine {
 		if ( ! QueryEngine.instance ) {
@@ -66,7 +66,7 @@ export class QueryEngine {
 	/**
 	 * Fetches global styles.
 	 *
-	 * @return {Promise<GlobalHeadProps>} The template data fetched for the uri.
+	 * @return The template data fetched for the uri.
 	 */
 	static getGlobalStyles = async (): Promise< GlobalHeadProps > => {
 		if ( ! QueryEngine.isClientInitialized ) {
@@ -155,7 +155,7 @@ export class QueryEngine {
 	 * Fetches blocks, scripts and styles for the given uri.
 	 * @param uri - The URL of the seed node.
 	 *
-	 * @return {Promise<Object>} The template data fetched for the uri.
+	 * @return The template data fetched for the uri.
 	 */
 	static getTemplateData = async (
 		uri: string
@@ -226,7 +226,7 @@ const logApolloErrors = ( error: ApolloError ): void => {
  *
  * @param networkError - The network error.
  *
- * @return {string} The network error message.
+ * @return The network error message.
  */
 const getNetworkErrorMessage = (
 	networkError: Error | ServerParseError | ServerError
diff --git a/packages/query/src/utils/parse-global-styles.ts b/packages/query/src/utils/parse-global-styles.ts
index 06a58929..d01715aa 100644
--- a/packages/query/src/utils/parse-global-styles.ts
+++ b/packages/query/src/utils/parse-global-styles.ts
@@ -13,7 +13,7 @@ import type { GetGlobalStylesQuery } from '@graphqlTypes/graphql';
  *
  * @throws Throws an error if the query data is missing or invalid.
  *
- * @return {GlobalHeadProps} An object containing parsed template data.
+ * @return An object containing parsed template data.
  */
 export default function parseQueryResult(
 	queryData: ApolloQueryResult< GetGlobalStylesQuery >
diff --git a/packages/query/src/utils/parse-template.ts b/packages/query/src/utils/parse-template.ts
index 6ef3f2e1..5bb6b1f2 100644
--- a/packages/query/src/utils/parse-template.ts
+++ b/packages/query/src/utils/parse-template.ts
@@ -16,7 +16,7 @@ import type { GetCurrentTemplateQuery } from '@graphqlTypes/graphql';
  * @param wordpressUrl - The base URL of the WordPress site.
  * @param uri - The URI of the template.
  *
- * @return {Object} An object containing parsed template data.
+ * @return An object containing parsed template data.
  */
 export default function parseQueryResult(
 	queryData: ApolloQueryResult< GetCurrentTemplateQuery >,
@@ -65,7 +65,7 @@ export default function parseQueryResult(
  *
  * @param templateByUri The template data fetched for the uri.
  *
- * @return {Array<string>|undefined} The body classes.
+ * @return The body classes.
  */
 function parseBodyClasses(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ]
@@ -91,7 +91,7 @@ function parseBodyClasses(
  * @param templateByUri The template data fetched for the uri.
  * @param wordpressUrl The base URL of the WordPress site.
  *
- * @return {Array<EnqueuedScriptProps>|undefined} The enqueued scripts.
+ * @return The enqueued scripts.
  */
 function parseEnqueuedScripts(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ],
@@ -115,7 +115,7 @@ function parseEnqueuedScripts(
  *
  * @param templateByUri The template data fetched for the uri.
  *
- * @return {Array<BlockData>|undefined} The editor blocks.
+ * @return The editor blocks.
  */
 function parseEditorBlocks(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ]
@@ -141,7 +141,7 @@ function parseEditorBlocks(
  * @param wordpressUrl The base URL of the WordPress site.
  * @param templateByUri The template data fetched for the uri.
  *
- * @return {Array<StyleSheetProps>|undefined} The enqueued stylesheets.
+ * @return The enqueued stylesheets.
  */
 function parseEnqueuedStylesheets(
 	wordpressUrl: string,
@@ -164,7 +164,7 @@ function parseEnqueuedStylesheets(
  * @param templateByUri The template data fetched for the uri.
  * @param wordpressUrl The base URL of the WordPress site.
  *
- * @return {Array<ScriptModuleProps>|undefined} The script modules.
+ * @return The script modules.
  */
 function parseScriptModules(
 	templateByUri: GetCurrentTemplateQuery[ 'templateByUri' ],

From d3bc9f9d2cade188806dc30d86d04d2696f1c992 Mon Sep 17 00:00:00 2001
From: Dovid Levine <david@axepress.dev>
Date: Tue, 25 Mar 2025 17:19:30 +0200
Subject: [PATCH 07/11] chore: add changeset

---
 .changeset/polite-turkeys-check.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .changeset/polite-turkeys-check.md

diff --git a/.changeset/polite-turkeys-check.md b/.changeset/polite-turkeys-check.md
new file mode 100644
index 00000000..fee78565
--- /dev/null
+++ b/.changeset/polite-turkeys-check.md
@@ -0,0 +1,9 @@
+---
+"@snapwp/e2e-tests": patch
+"@snapwp/blocks": patch
+"@snapwp/query": patch
+"@snapwp/core": patch
+"@snapwp/next": patch
+---
+
+chore: Add and enforce explicit return types on method signatures.

From 6fb27edadeec3bc48789eafbf8aa3ce6eee90526 Mon Sep 17 00:00:00 2001
From: Dovid Levine <david@axepress.dev>
Date: Tue, 25 Mar 2025 18:10:16 +0200
Subject: [PATCH 08/11] dev: use `ReactNode` over `JSX.Element` + modifiers

---
 packages/blocks/src/blocks/core-audio.tsx                 | 2 +-
 packages/blocks/src/blocks/core-button.tsx                | 2 +-
 packages/blocks/src/blocks/core-buttons.tsx               | 2 +-
 packages/blocks/src/blocks/core-code.tsx                  | 2 +-
 packages/blocks/src/blocks/core-column.tsx                | 2 +-
 packages/blocks/src/blocks/core-columns.tsx               | 2 +-
 packages/blocks/src/blocks/core-cover.tsx                 | 2 +-
 packages/blocks/src/blocks/core-details.tsx               | 2 +-
 packages/blocks/src/blocks/core-file.tsx                  | 2 +-
 packages/blocks/src/blocks/core-freeform.tsx              | 2 +-
 packages/blocks/src/blocks/core-gallery.tsx               | 2 +-
 packages/blocks/src/blocks/core-group.tsx                 | 4 ++--
 packages/blocks/src/blocks/core-heading.tsx               | 2 +-
 packages/blocks/src/blocks/core-html.tsx                  | 2 +-
 packages/blocks/src/blocks/core-image.tsx                 | 4 ++--
 packages/blocks/src/blocks/core-list-item.tsx             | 2 +-
 packages/blocks/src/blocks/core-list.tsx                  | 2 +-
 packages/blocks/src/blocks/core-media-text.tsx            | 2 +-
 packages/blocks/src/blocks/core-paragraph.tsx             | 2 +-
 packages/blocks/src/blocks/core-pattern.tsx               | 2 +-
 packages/blocks/src/blocks/core-post-content.tsx          | 2 +-
 packages/blocks/src/blocks/core-preformatted.tsx          | 2 +-
 packages/blocks/src/blocks/core-pullquote.tsx             | 2 +-
 packages/blocks/src/blocks/core-quote.tsx                 | 2 +-
 packages/blocks/src/blocks/core-separator.tsx             | 2 +-
 packages/blocks/src/blocks/core-spacer.tsx                | 2 +-
 packages/blocks/src/blocks/core-template-part.tsx         | 2 +-
 packages/blocks/src/blocks/core-verse.tsx                 | 2 +-
 packages/blocks/src/blocks/core-video.tsx                 | 4 ++--
 packages/blocks/src/blocks/default.tsx                    | 2 +-
 packages/blocks/src/editor-blocks-renderer/index.tsx      | 4 ++--
 .../core/src/config/tests/snapwp-config-manager.test.tsx  | 2 +-
 packages/next/src/components/default-error.tsx            | 2 +-
 packages/next/src/components/font.tsx                     | 2 +-
 packages/next/src/components/image.tsx                    | 2 +-
 packages/next/src/components/link.tsx                     | 2 +-
 packages/next/src/components/script-module.tsx            | 2 +-
 packages/next/src/components/script.tsx                   | 2 +-
 packages/next/src/react-parser/index.tsx                  | 2 +-
 packages/next/src/root-layout/global-head.tsx             | 2 +-
 packages/next/src/root-layout/index.tsx                   | 2 +-
 packages/next/src/template-renderer/index.tsx             | 6 +++---
 packages/next/src/template-renderer/template-head.tsx     | 2 +-
 packages/next/src/template-renderer/template-scripts.tsx  | 8 ++++----
 44 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/packages/blocks/src/blocks/core-audio.tsx b/packages/blocks/src/blocks/core-audio.tsx
index c4e7efec..b95e6d51 100644
--- a/packages/blocks/src/blocks/core-audio.tsx
+++ b/packages/blocks/src/blocks/core-audio.tsx
@@ -17,7 +17,7 @@ import type { CoreAudio as CoreAudioType, CoreAudioProps } from '@snapwp/types';
 const CoreAudio: CoreAudioType = ( {
 	attributes,
 	renderedHtml,
-}: CoreAudioProps ): React.JSX.Element | null => {
+}: CoreAudioProps ): React.ReactNode => {
 	const { autoplay, caption, loop, preload, src, style } = attributes || {};
 
 	if ( ! src ) {
diff --git a/packages/blocks/src/blocks/core-button.tsx b/packages/blocks/src/blocks/core-button.tsx
index 115f2543..371625e5 100644
--- a/packages/blocks/src/blocks/core-button.tsx
+++ b/packages/blocks/src/blocks/core-button.tsx
@@ -16,7 +16,7 @@ import type { ButtonHTMLAttributes } from 'react';
  */
 const CoreButton: CoreButtonType = ( {
 	attributes,
-}: CoreButtonProps ): React.JSX.Element => {
+}: CoreButtonProps ): React.ReactNode => {
 	const {
 		buttonType,
 		cssClassName,
diff --git a/packages/blocks/src/blocks/core-buttons.tsx b/packages/blocks/src/blocks/core-buttons.tsx
index cc440118..2e0386c1 100644
--- a/packages/blocks/src/blocks/core-buttons.tsx
+++ b/packages/blocks/src/blocks/core-buttons.tsx
@@ -16,7 +16,7 @@ import type {
 const CoreButtons: CoreButtonsType = ( {
 	attributes,
 	children,
-}: CoreButtonsProps ): React.JSX.Element => {
+}: CoreButtonsProps ): React.ReactNode => {
 	const { cssClassName, style } = attributes || {};
 	const classNames = cn( cssClassName );
 
diff --git a/packages/blocks/src/blocks/core-code.tsx b/packages/blocks/src/blocks/core-code.tsx
index d5404d5f..dafdf268 100644
--- a/packages/blocks/src/blocks/core-code.tsx
+++ b/packages/blocks/src/blocks/core-code.tsx
@@ -12,7 +12,7 @@ import type { CoreCode as CoreCodeType, CoreCodeProps } from '@snapwp/types';
  */
 const CoreCode: CoreCodeType = ( {
 	attributes,
-}: CoreCodeProps ): React.JSX.Element => {
+}: CoreCodeProps ): React.ReactNode => {
 	const { style, cssClassName, content } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-column.tsx b/packages/blocks/src/blocks/core-column.tsx
index 024ec390..32922c50 100644
--- a/packages/blocks/src/blocks/core-column.tsx
+++ b/packages/blocks/src/blocks/core-column.tsx
@@ -17,7 +17,7 @@ import type { CSSProperties } from 'react';
 const CoreColumn: CoreColumnType = ( {
 	attributes,
 	children,
-}: CoreColumnProps ): React.JSX.Element => {
+}: CoreColumnProps ): React.ReactNode => {
 	const { cssClassName, style, width } = attributes || {};
 
 	const classNames = cn( cssClassName );
diff --git a/packages/blocks/src/blocks/core-columns.tsx b/packages/blocks/src/blocks/core-columns.tsx
index e65fa1fc..868e495d 100644
--- a/packages/blocks/src/blocks/core-columns.tsx
+++ b/packages/blocks/src/blocks/core-columns.tsx
@@ -16,7 +16,7 @@ import type {
 const CoreColumns: CoreColumnsType = ( {
 	attributes,
 	children,
-}: CoreColumnsProps ): React.JSX.Element => {
+}: CoreColumnsProps ): React.ReactNode => {
 	const { cssClassName, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-cover.tsx b/packages/blocks/src/blocks/core-cover.tsx
index 21af38d3..080e875f 100644
--- a/packages/blocks/src/blocks/core-cover.tsx
+++ b/packages/blocks/src/blocks/core-cover.tsx
@@ -53,7 +53,7 @@ const CoreCover: CoreCoverType = ( {
 	mediaDetails,
 	children,
 	renderedHtml,
-}: CoreCoverProps ): React.JSX.Element => {
+}: CoreCoverProps ): React.ReactNode => {
 	// Rest of the component implementation remains unchanged
 	const {
 		alt,
diff --git a/packages/blocks/src/blocks/core-details.tsx b/packages/blocks/src/blocks/core-details.tsx
index c55ba002..8276f204 100644
--- a/packages/blocks/src/blocks/core-details.tsx
+++ b/packages/blocks/src/blocks/core-details.tsx
@@ -22,7 +22,7 @@ const CoreDetails: CoreDetailsType = ( {
 	attributes,
 	children,
 	renderedHtml,
-}: CoreDetailsProps ): React.JSX.Element => {
+}: CoreDetailsProps ): React.ReactNode => {
 	const { style, showContent, summary } = attributes ?? {};
 	const styleObject = getStylesFromAttributes( { style } );
 
diff --git a/packages/blocks/src/blocks/core-file.tsx b/packages/blocks/src/blocks/core-file.tsx
index 66eacc80..e86eb832 100644
--- a/packages/blocks/src/blocks/core-file.tsx
+++ b/packages/blocks/src/blocks/core-file.tsx
@@ -21,7 +21,7 @@ const FALLBACK_ARIA_LABEL = 'PDF embed';
 const CoreFile: CoreFileType = ( {
 	attributes,
 	renderedHtml,
-}: CoreFileProps ): React.JSX.Element | null => {
+}: CoreFileProps ): React.ReactNode => {
 	const {
 		displayPreview,
 		downloadButtonText,
diff --git a/packages/blocks/src/blocks/core-freeform.tsx b/packages/blocks/src/blocks/core-freeform.tsx
index 3d5fbdfb..07aa235b 100644
--- a/packages/blocks/src/blocks/core-freeform.tsx
+++ b/packages/blocks/src/blocks/core-freeform.tsx
@@ -14,7 +14,7 @@ import type {
  */
 const CoreFreeform: CoreFreeformType = ( {
 	renderedHtml,
-}: CoreFreeformProps ): React.JSX.Element | null => {
+}: CoreFreeformProps ): React.ReactNode => {
 	// @todo `attribues.content` is not populated in GraphQL. Using `renderedHtml` for now.
 	if ( ! renderedHtml ) {
 		return null;
diff --git a/packages/blocks/src/blocks/core-gallery.tsx b/packages/blocks/src/blocks/core-gallery.tsx
index 726f1533..67fbd636 100644
--- a/packages/blocks/src/blocks/core-gallery.tsx
+++ b/packages/blocks/src/blocks/core-gallery.tsx
@@ -22,7 +22,7 @@ const CoreGallery: CoreGalleryType = ( {
 	attributes,
 	children,
 	renderedHtml,
-}: CoreGalleryProps ): React.JSX.Element => {
+}: CoreGalleryProps ): React.ReactNode => {
 	const { caption, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-group.tsx b/packages/blocks/src/blocks/core-group.tsx
index 3334d75e..065c905b 100644
--- a/packages/blocks/src/blocks/core-group.tsx
+++ b/packages/blocks/src/blocks/core-group.tsx
@@ -30,7 +30,7 @@ const Tag = ( {
 	name?: string;
 	className: string;
 	style?: CSSProperties;
-} > ): React.JSX.Element => {
+} > ): React.ReactNode => {
 	if ( ! name ) {
 		return <>{ children }</>;
 	}
@@ -52,7 +52,7 @@ const CoreGroup: CoreGroupType = ( {
 	attributes,
 	renderedHtml,
 	children,
-}: CoreGroupProps ): React.JSX.Element => {
+}: CoreGroupProps ): React.ReactNode => {
 	const { style, tagName } = attributes ?? {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-heading.tsx b/packages/blocks/src/blocks/core-heading.tsx
index a955cac6..0ec87091 100644
--- a/packages/blocks/src/blocks/core-heading.tsx
+++ b/packages/blocks/src/blocks/core-heading.tsx
@@ -16,7 +16,7 @@ import type {
  */
 const CoreHeading: CoreHeadingType = ( {
 	attributes,
-}: CoreHeadingProps ): React.JSX.Element => {
+}: CoreHeadingProps ): React.ReactNode => {
 	const { style, cssClassName, content, level } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-html.tsx b/packages/blocks/src/blocks/core-html.tsx
index f908fd74..3089c0dc 100644
--- a/packages/blocks/src/blocks/core-html.tsx
+++ b/packages/blocks/src/blocks/core-html.tsx
@@ -11,7 +11,7 @@ import type { CoreHtml as CoreHtmlType, CoreHtmlProps } from '@snapwp/types';
  */
 const CoreHtml: CoreHtmlType = ( {
 	renderedHtml,
-}: CoreHtmlProps ): React.JSX.Element | null => {
+}: CoreHtmlProps ): React.ReactNode => {
 	// @todo use attributes.content instead of renderedHtml once it's available
 	if ( ! renderedHtml ) {
 		return null;
diff --git a/packages/blocks/src/blocks/core-image.tsx b/packages/blocks/src/blocks/core-image.tsx
index caed1dea..42622a24 100644
--- a/packages/blocks/src/blocks/core-image.tsx
+++ b/packages/blocks/src/blocks/core-image.tsx
@@ -39,7 +39,7 @@ const Figure = ( {
 	linkTarget,
 	rel,
 	lightbox,
-}: FigureProps ): React.JSX.Element => {
+}: FigureProps ): React.ReactNode => {
 	let props: ComponentProps< 'figure' > = {};
 
 	if ( isLightboxEnabled( lightbox ) ) {
@@ -85,7 +85,7 @@ const CoreImage: CoreImageType = ( {
 	connectedMediaItem,
 	mediaDetails,
 	renderedHtml,
-}: CoreImageProps ): React.JSX.Element | null => {
+}: CoreImageProps ): React.ReactNode => {
 	// @todo: fetchPriority is missing
 	const { caption, url, lightbox } = attributes || {};
 
diff --git a/packages/blocks/src/blocks/core-list-item.tsx b/packages/blocks/src/blocks/core-list-item.tsx
index a5a6f909..29e8f583 100644
--- a/packages/blocks/src/blocks/core-list-item.tsx
+++ b/packages/blocks/src/blocks/core-list-item.tsx
@@ -23,7 +23,7 @@ const CoreListItem: CoreListItemType = ( {
 	attributes,
 	renderedHtml,
 	children,
-}: CoreListItemProps ): React.JSX.Element => {
+}: CoreListItemProps ): React.ReactNode => {
 	const { content, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-list.tsx b/packages/blocks/src/blocks/core-list.tsx
index 5d8f0e67..5e90f3d4 100644
--- a/packages/blocks/src/blocks/core-list.tsx
+++ b/packages/blocks/src/blocks/core-list.tsx
@@ -14,7 +14,7 @@ import type { CSSProperties } from 'react';
 const CoreList: CoreListType = ( {
 	attributes,
 	children,
-}: CoreListProps ): React.JSX.Element => {
+}: CoreListProps ): React.ReactNode => {
 	const { cssClassName, ordered, reversed, start, style, type } =
 		attributes || {};
 
diff --git a/packages/blocks/src/blocks/core-media-text.tsx b/packages/blocks/src/blocks/core-media-text.tsx
index 75c5ed2d..1d8e10ad 100644
--- a/packages/blocks/src/blocks/core-media-text.tsx
+++ b/packages/blocks/src/blocks/core-media-text.tsx
@@ -64,7 +64,7 @@ const CoreMediaText: CoreMediaTextType = ( {
 	renderedHtml,
 	connectedMediaItem,
 	mediaDetails,
-}: CoreMediaTextProps ): React.JSX.Element => {
+}: CoreMediaTextProps ): React.ReactNode => {
 	// If there is no media URL or children, render the parsed HTML
 	if ( ! attributes?.mediaUrl && ! children ) {
 		return <Parse html={ renderedHtml || '' } />;
diff --git a/packages/blocks/src/blocks/core-paragraph.tsx b/packages/blocks/src/blocks/core-paragraph.tsx
index 72979657..68692130 100644
--- a/packages/blocks/src/blocks/core-paragraph.tsx
+++ b/packages/blocks/src/blocks/core-paragraph.tsx
@@ -15,7 +15,7 @@ import type {
  */
 const CoreParagraph: CoreParagraphType = ( {
 	attributes,
-}: CoreParagraphProps ): React.JSX.Element => {
+}: CoreParagraphProps ): React.ReactNode => {
 	const {
 		backgroundColor,
 		content,
diff --git a/packages/blocks/src/blocks/core-pattern.tsx b/packages/blocks/src/blocks/core-pattern.tsx
index 662e4314..5b24651a 100644
--- a/packages/blocks/src/blocks/core-pattern.tsx
+++ b/packages/blocks/src/blocks/core-pattern.tsx
@@ -13,7 +13,7 @@ import type {
  */
 const CorePattern: CorePatternType = ( {
 	children,
-}: CorePatternProps ): React.JSX.Element => {
+}: CorePatternProps ): React.ReactNode => {
 	// Patterns contain only children, so we just return them.
 	return <>{ children }</>;
 };
diff --git a/packages/blocks/src/blocks/core-post-content.tsx b/packages/blocks/src/blocks/core-post-content.tsx
index e066ebf6..72a0b08e 100644
--- a/packages/blocks/src/blocks/core-post-content.tsx
+++ b/packages/blocks/src/blocks/core-post-content.tsx
@@ -16,7 +16,7 @@ import type {
 const CorePostContent: CorePostContentType = ( {
 	renderedHtml,
 	children,
-}: CorePostContentProps ): React.JSX.Element => {
+}: CorePostContentProps ): React.ReactNode => {
 	/**
 	 * @todo replace with cssClassName once it's supported.
 	 */
diff --git a/packages/blocks/src/blocks/core-preformatted.tsx b/packages/blocks/src/blocks/core-preformatted.tsx
index c329afe0..6677966a 100644
--- a/packages/blocks/src/blocks/core-preformatted.tsx
+++ b/packages/blocks/src/blocks/core-preformatted.tsx
@@ -21,7 +21,7 @@ import type {
 const CorePreformatted: CorePreformattedType = ( {
 	attributes,
 	renderedHtml,
-}: CorePreformattedProps ): React.JSX.Element => {
+}: CorePreformattedProps ): React.ReactNode => {
 	const { content, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-pullquote.tsx b/packages/blocks/src/blocks/core-pullquote.tsx
index 0e354ecb..1131adaa 100644
--- a/packages/blocks/src/blocks/core-pullquote.tsx
+++ b/packages/blocks/src/blocks/core-pullquote.tsx
@@ -21,7 +21,7 @@ import type {
 const CorePullquote: CorePullquoteType = ( {
 	attributes,
 	renderedHtml,
-}: CorePullquoteProps ): React.JSX.Element => {
+}: CorePullquoteProps ): React.ReactNode => {
 	const { style, pullquoteValue, citation } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-quote.tsx b/packages/blocks/src/blocks/core-quote.tsx
index 173bbb76..e717355c 100644
--- a/packages/blocks/src/blocks/core-quote.tsx
+++ b/packages/blocks/src/blocks/core-quote.tsx
@@ -14,7 +14,7 @@ import type { CoreQuote as CoreQuoteType, CoreQuoteProps } from '@snapwp/types';
 const CoreQuote: CoreQuoteType = ( {
 	attributes,
 	children,
-}: CoreQuoteProps ): React.JSX.Element => {
+}: CoreQuoteProps ): React.ReactNode => {
 	const { style, citation, cssClassName } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-separator.tsx b/packages/blocks/src/blocks/core-separator.tsx
index c3acf37f..c6ecefab 100644
--- a/packages/blocks/src/blocks/core-separator.tsx
+++ b/packages/blocks/src/blocks/core-separator.tsx
@@ -14,7 +14,7 @@ import type {
  */
 const CoreSeparator: CoreSeparatorType = ( {
 	renderedHtml,
-}: CoreSeparatorProps ): React.JSX.Element => {
+}: CoreSeparatorProps ): React.ReactNode => {
 	const classes = getClassNamesFromString( renderedHtml || '' ).join( ' ' );
 	return <hr className={ classes } />;
 };
diff --git a/packages/blocks/src/blocks/core-spacer.tsx b/packages/blocks/src/blocks/core-spacer.tsx
index ca1fecac..8226101c 100644
--- a/packages/blocks/src/blocks/core-spacer.tsx
+++ b/packages/blocks/src/blocks/core-spacer.tsx
@@ -21,7 +21,7 @@ import type {
 const CoreSpacer: CoreSpacerType = ( {
 	attributes,
 	renderedHtml,
-}: CoreSpacerProps ): React.JSX.Element => {
+}: CoreSpacerProps ): React.ReactNode => {
 	const { height, width, style } = attributes || {};
 
 	const parsedStyle = style ? JSON.parse( style ) : {};
diff --git a/packages/blocks/src/blocks/core-template-part.tsx b/packages/blocks/src/blocks/core-template-part.tsx
index 91dc9fd0..7b633948 100644
--- a/packages/blocks/src/blocks/core-template-part.tsx
+++ b/packages/blocks/src/blocks/core-template-part.tsx
@@ -19,7 +19,7 @@ const CoreTemplatePart: CoreTemplatePartType = ( {
 	renderedHtml,
 	children,
 	attributes,
-}: CoreTemplatePartProps ): React.JSX.Element => {
+}: CoreTemplatePartProps ): React.ReactNode => {
 	const { templatePartTagName, area } = attributes || {};
 
 	const htmlTag = templatePartTagName || area || 'div';
diff --git a/packages/blocks/src/blocks/core-verse.tsx b/packages/blocks/src/blocks/core-verse.tsx
index 481c8046..1e2cea7a 100644
--- a/packages/blocks/src/blocks/core-verse.tsx
+++ b/packages/blocks/src/blocks/core-verse.tsx
@@ -18,7 +18,7 @@ import type { CoreVerse as CoreVerseType, CoreVerseProps } from '@snapwp/types';
 const CoreVerse: CoreVerseType = ( {
 	attributes,
 	renderedHtml,
-}: CoreVerseProps ): React.JSX.Element => {
+}: CoreVerseProps ): React.ReactNode => {
 	const { style, content } = attributes ?? {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-video.tsx b/packages/blocks/src/blocks/core-video.tsx
index 136cc1b9..3d7c4bee 100644
--- a/packages/blocks/src/blocks/core-video.tsx
+++ b/packages/blocks/src/blocks/core-video.tsx
@@ -22,7 +22,7 @@ const Tracks = ( {
 	tracks,
 }: {
 	tracks?: TrackProps[] | undefined;
-} ): React.JSX.Element | null => {
+} ): React.ReactNode => {
 	if ( ! tracks || tracks.length === 0 ) {
 		return null;
 	}
@@ -53,7 +53,7 @@ const Tracks = ( {
 const CoreVideo: CoreVideoType = ( {
 	attributes,
 	renderedHtml,
-}: CoreVideoProps ): React.JSX.Element | null => {
+}: CoreVideoProps ): React.ReactNode => {
 	const {
 		autoplay,
 		caption,
diff --git a/packages/blocks/src/blocks/default.tsx b/packages/blocks/src/blocks/default.tsx
index 65964c95..28281ae9 100644
--- a/packages/blocks/src/blocks/default.tsx
+++ b/packages/blocks/src/blocks/default.tsx
@@ -10,7 +10,7 @@ import type { Default as DefaultType, DefaultProps } from '@snapwp/types';
  */
 const Default: DefaultType = ( {
 	renderedHtml,
-}: DefaultProps ): React.JSX.Element | null => {
+}: DefaultProps ): React.ReactNode => {
 	if ( ! renderedHtml ) {
 		return null;
 	}
diff --git a/packages/blocks/src/editor-blocks-renderer/index.tsx b/packages/blocks/src/editor-blocks-renderer/index.tsx
index 2e89468f..007adcd1 100644
--- a/packages/blocks/src/editor-blocks-renderer/index.tsx
+++ b/packages/blocks/src/editor-blocks-renderer/index.tsx
@@ -19,7 +19,7 @@ type EditorBlocksRendererProps = {
 export default function EditorBlocksRenderer( {
 	editorBlocks,
 	blockDefinitions,
-}: EditorBlocksRendererProps ): React.JSX.Element[] {
+}: EditorBlocksRendererProps ): React.ReactNode {
 	const { blockDefinitions: globalBlockDefinitions } = getConfig();
 
 	const resolvedBlockDefinitions = globalBlockDefinitions ?? blockDefinitions;
@@ -31,7 +31,7 @@ export default function EditorBlocksRenderer( {
 	const parsedTree = BlockManager.parseBlockForRendering( editorBlocks );
 
 	// eslint-disable-next-line jsdoc/require-jsdoc -- Disable jsdoc for local function.
-	const renderNode = ( node: BlockTreeNode ): React.JSX.Element => {
+	const renderNode = ( node: BlockTreeNode ): React.ReactNode => {
 		const props: Record< string, unknown > = {
 			key: node.clientId,
 			...node,
diff --git a/packages/core/src/config/tests/snapwp-config-manager.test.tsx b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
index 1b5a96f7..eceb602a 100644
--- a/packages/core/src/config/tests/snapwp-config-manager.test.tsx
+++ b/packages/core/src/config/tests/snapwp-config-manager.test.tsx
@@ -14,7 +14,7 @@ const SnapWPConfigManager = _private.SnapWPConfigManager!;
  *
  * @return A div containing "Test Block".
  */
-const MockBlockComponent = (): React.JSX.Element => <div>Test Block</div>;
+const MockBlockComponent = (): React.ReactNode => <div>Test Block</div>;
 
 describe( 'SnapWPConfigManager functions', () => {
 	let ORIG_ENV: NodeJS.ProcessEnv;
diff --git a/packages/next/src/components/default-error.tsx b/packages/next/src/components/default-error.tsx
index a0f49009..255c1446 100644
--- a/packages/next/src/components/default-error.tsx
+++ b/packages/next/src/components/default-error.tsx
@@ -18,7 +18,7 @@ export default function DefaultError( {
 }: {
 	error: Error & { digest?: string };
 	reset: () => void;
-} ): React.JSX.Element {
+} ): React.ReactNode {
 	const unknownError =
 		'An unexpected error has occurred. Please check the logs for more details.';
 	const tryAgain = 'Try Again';
diff --git a/packages/next/src/components/font.tsx b/packages/next/src/components/font.tsx
index 341b60f2..590a3718 100644
--- a/packages/next/src/components/font.tsx
+++ b/packages/next/src/components/font.tsx
@@ -10,7 +10,7 @@
  */
 export default function Fonts( props: {
 	renderedFontFaces: string;
-} ): React.JSX.Element {
+} ): React.ReactNode {
 	const { renderedFontFaces } = props;
 
 	// @todo: we might need to proxy these for CORS.
diff --git a/packages/next/src/components/image.tsx b/packages/next/src/components/image.tsx
index 81703828..73eb6012 100644
--- a/packages/next/src/components/image.tsx
+++ b/packages/next/src/components/image.tsx
@@ -60,7 +60,7 @@ export default function Image( {
 	...props
 }: PropsWithoutRef<
 	ImageInterface & ( ImageProps | ImgHTMLAttributes< HTMLImageElement > )
-> ): React.JSX.Element | null {
+> ): React.ReactNode {
 	const altText = alt || image?.altText || '';
 	const originalWidth = image?.mediaDetails?.width;
 	const originalHeight = image?.mediaDetails?.height;
diff --git a/packages/next/src/components/link.tsx b/packages/next/src/components/link.tsx
index 66854cab..63a5e870 100644
--- a/packages/next/src/components/link.tsx
+++ b/packages/next/src/components/link.tsx
@@ -37,7 +37,7 @@ export default function Link( {
 			| AnchorHTMLAttributes< HTMLAnchorElement >
 			| PartialWithUndefined< LinkProps >
 		)
-> ): React.JSX.Element {
+> ): React.ReactNode {
 	const { graphqlEndpoint } = getConfig();
 
 	const internalUri = href
diff --git a/packages/next/src/components/script-module.tsx b/packages/next/src/components/script-module.tsx
index 15bb6be1..03669a71 100644
--- a/packages/next/src/components/script-module.tsx
+++ b/packages/next/src/components/script-module.tsx
@@ -42,7 +42,7 @@ export default function ScriptModule( {
 	dependencies,
 	extraData,
 	...props
-}: PropsWithoutRef< ScriptModuleInterface > ): React.JSX.Element {
+}: PropsWithoutRef< ScriptModuleInterface > ): React.ReactNode {
 	// Generate dependency scripts
 	const DependencyScripts = dependencies?.map( ( dep, index ) => {
 		if ( ! dep?.connectedScriptModule ) {
diff --git a/packages/next/src/components/script.tsx b/packages/next/src/components/script.tsx
index b1a131ae..1b418179 100644
--- a/packages/next/src/components/script.tsx
+++ b/packages/next/src/components/script.tsx
@@ -34,7 +34,7 @@ export default function Script( {
 	src,
 	loadingStrategy,
 	...props
-}: PropsWithoutRef< ScriptInterface & ScriptProps > ): React.JSX.Element {
+}: PropsWithoutRef< ScriptInterface & ScriptProps > ): React.ReactNode {
 	const beforeScript = Array.isArray( before )
 		? before.join( ' ' )
 		: undefined;
diff --git a/packages/next/src/react-parser/index.tsx b/packages/next/src/react-parser/index.tsx
index 476ee384..2162a020 100644
--- a/packages/next/src/react-parser/index.tsx
+++ b/packages/next/src/react-parser/index.tsx
@@ -10,7 +10,7 @@ import type { HTMLReactParserOptions } from 'html-react-parser';
  *
  * @return The rendered React components.
  */
-export default function Parse( { html }: { html: string } ): React.JSX.Element {
+export default function Parse( { html }: { html: string } ): React.ReactNode {
 	const {
 		parserOptions = defaultOptions,
 	}: { parserOptions?: HTMLReactParserOptions } = getConfig();
diff --git a/packages/next/src/root-layout/global-head.tsx b/packages/next/src/root-layout/global-head.tsx
index 451a9fff..368bdd61 100644
--- a/packages/next/src/root-layout/global-head.tsx
+++ b/packages/next/src/root-layout/global-head.tsx
@@ -16,7 +16,7 @@ export function GlobalHead( {
 	customCss,
 	globalStylesheet,
 	renderedFontFaces,
-}: GlobalHeadProps ): React.JSX.Element {
+}: GlobalHeadProps ): React.ReactNode {
 	return (
 		<>
 			{ globalStylesheet && (
diff --git a/packages/next/src/root-layout/index.tsx b/packages/next/src/root-layout/index.tsx
index 9a6d3f5c..1634f8d5 100644
--- a/packages/next/src/root-layout/index.tsx
+++ b/packages/next/src/root-layout/index.tsx
@@ -19,7 +19,7 @@ export type RootLayoutProps = {
 export async function RootLayout( {
 	getGlobalStyles = QueryEngine.getGlobalStyles,
 	children,
-}: PropsWithChildren< RootLayoutProps > ): Promise< React.JSX.Element > {
+}: PropsWithChildren< RootLayoutProps > ): Promise< React.ReactNode > {
 	const globalHeadProps = await getGlobalStyles();
 
 	return (
diff --git a/packages/next/src/template-renderer/index.tsx b/packages/next/src/template-renderer/index.tsx
index a73aae98..00eca010 100644
--- a/packages/next/src/template-renderer/index.tsx
+++ b/packages/next/src/template-renderer/index.tsx
@@ -1,14 +1,14 @@
-import type { JSX } from 'react';
 import { headers } from 'next/headers';
 import { QueryEngine } from '@snapwp/query';
 import { TemplateHead } from './template-head';
 import { TemplateScripts } from './template-scripts';
 import Script from 'next/script';
 import type { BlockData } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 export type TemplateRendererProps = {
 	getTemplateData?: ( typeof QueryEngine )[ 'getTemplateData' ];
-	children: ( editorBlocks: BlockData[] ) => JSX.Element;
+	children: ( editorBlocks: BlockData[] ) => ReactNode;
 };
 
 /**
@@ -24,7 +24,7 @@ export type TemplateRendererProps = {
 export async function TemplateRenderer( {
 	getTemplateData = QueryEngine.getTemplateData,
 	children,
-}: TemplateRendererProps ): Promise< React.JSX.Element > {
+}: TemplateRendererProps ): Promise< React.ReactNode > {
 	const headerList = await headers(); // headers() returns a Promise from NextJS 19.
 	const pathname = headerList.get( 'x-current-path' );
 
diff --git a/packages/next/src/template-renderer/template-head.tsx b/packages/next/src/template-renderer/template-head.tsx
index 047acf4a..633b1a3c 100644
--- a/packages/next/src/template-renderer/template-head.tsx
+++ b/packages/next/src/template-renderer/template-head.tsx
@@ -15,7 +15,7 @@ export interface TemplateHeadProps {
  */
 export function TemplateHead( {
 	stylesheets,
-}: TemplateHeadProps ): Array< React.JSX.Element > | null {
+}: TemplateHeadProps ): Array< React.ReactNode > | null {
 	if ( ! stylesheets ) {
 		return null;
 	}
diff --git a/packages/next/src/template-renderer/template-scripts.tsx b/packages/next/src/template-renderer/template-scripts.tsx
index 47760791..3ac1f9d9 100644
--- a/packages/next/src/template-renderer/template-scripts.tsx
+++ b/packages/next/src/template-renderer/template-scripts.tsx
@@ -17,7 +17,7 @@ const ScriptMap = ( {
 	scripts,
 }: {
 	scripts: EnqueuedScriptProps[];
-} ): React.JSX.Element => (
+} ): React.ReactNode => (
 	<>
 		{ scripts?.map( ( { handle, src, ...rest }, id ) => {
 			return (
@@ -43,7 +43,7 @@ const ImportMap = ( {
 	scriptModules,
 }: {
 	scriptModules: ScriptModuleProps[];
-} ): React.JSX.Element | null => {
+} ): React.ReactNode => {
 	// Generate import map from all module dependencies
 	const { wpHomeUrl, corsProxyPrefix } = getConfig();
 
@@ -92,7 +92,7 @@ const ScriptModuleMap = ( {
 	scriptModules,
 }: {
 	scriptModules?: ScriptModuleProps[];
-} ): React.JSX.Element | null => {
+} ): React.ReactNode => {
 	const { wpHomeUrl, corsProxyPrefix } = getConfig();
 	// Array to store handles of script modules that should not be loaded
 	const uniqueScriptModuleDependencies = new Set< string >();
@@ -178,7 +178,7 @@ export function TemplateScripts( {
 }: PropsWithChildren< {
 	scripts: EnqueuedScriptProps[] | undefined;
 	scriptModules: ScriptModuleProps[] | undefined;
-} > ): React.JSX.Element {
+} > ): React.ReactNode {
 	// Separate scripts by location
 	const headerScripts =
 		scripts?.filter( ( script ) => script.groupLocation === 'HEADER' ) ??

From 896550fa3be1017a624f29231d60f45dc4624b10 Mon Sep 17 00:00:00 2001
From: Dovid Levine <david@axepress.dev>
Date: Tue, 25 Mar 2025 18:28:17 +0200
Subject: [PATCH 09/11] chore: import `React` types directly instead of via
 namespace

---
 packages/blocks/src/blocks/core-audio.tsx              |  3 ++-
 packages/blocks/src/blocks/core-button.tsx             |  4 ++--
 packages/blocks/src/blocks/core-buttons.tsx            |  3 ++-
 packages/blocks/src/blocks/core-code.tsx               |  5 ++---
 packages/blocks/src/blocks/core-column.tsx             |  4 ++--
 packages/blocks/src/blocks/core-columns.tsx            |  3 ++-
 packages/blocks/src/blocks/core-cover.tsx              |  2 +-
 packages/blocks/src/blocks/core-details.tsx            |  3 ++-
 packages/blocks/src/blocks/core-file.tsx               |  3 ++-
 packages/blocks/src/blocks/core-freeform.tsx           |  3 ++-
 packages/blocks/src/blocks/core-gallery.tsx            |  3 ++-
 packages/blocks/src/blocks/core-group.tsx              |  5 +++--
 packages/blocks/src/blocks/core-heading.tsx            |  4 ++--
 packages/blocks/src/blocks/core-html.tsx               |  3 ++-
 packages/blocks/src/blocks/core-image.tsx              |  6 +++---
 packages/blocks/src/blocks/core-list-item.tsx          |  3 ++-
 packages/blocks/src/blocks/core-list.tsx               |  4 ++--
 packages/blocks/src/blocks/core-media-text.tsx         |  4 ++--
 packages/blocks/src/blocks/core-paragraph.tsx          |  3 ++-
 packages/blocks/src/blocks/core-pattern.tsx            |  3 ++-
 packages/blocks/src/blocks/core-post-content.tsx       |  3 ++-
 packages/blocks/src/blocks/core-preformatted.tsx       |  3 ++-
 packages/blocks/src/blocks/core-pullquote.tsx          |  3 ++-
 packages/blocks/src/blocks/core-quote.tsx              |  3 ++-
 packages/blocks/src/blocks/core-separator.tsx          |  3 ++-
 packages/blocks/src/blocks/core-spacer.tsx             |  3 ++-
 packages/blocks/src/blocks/core-template-part.tsx      |  4 ++--
 packages/blocks/src/blocks/core-verse.tsx              |  3 ++-
 packages/blocks/src/blocks/core-video.tsx              |  5 +++--
 packages/blocks/src/blocks/default.tsx                 |  5 ++---
 packages/blocks/src/editor-blocks-renderer/index.tsx   |  5 +++--
 packages/next/src/components/default-error.tsx         |  4 +++-
 packages/next/src/components/font.tsx                  |  4 +++-
 packages/next/src/components/image.tsx                 |  3 ++-
 packages/next/src/components/link.tsx                  |  3 ++-
 packages/next/src/components/script-module.tsx         |  4 ++--
 packages/next/src/components/script.tsx                |  4 ++--
 packages/next/src/react-parser/index.tsx               |  3 ++-
 packages/next/src/root-layout/global-head.tsx          |  3 ++-
 packages/next/src/root-layout/index.tsx                |  4 ++--
 packages/next/src/template-renderer/index.tsx          |  2 +-
 packages/next/src/template-renderer/template-head.tsx  |  6 ++----
 .../next/src/template-renderer/template-scripts.tsx    | 10 +++++-----
 packages/types/src/blocks/base.ts                      |  6 ++++--
 packages/types/src/blocks/definitions.ts               |  6 ++++--
 packages/types/src/blocks/props/core-audio.ts          |  3 ++-
 packages/types/src/blocks/props/core-button.ts         |  3 ++-
 packages/types/src/blocks/props/core-buttons.ts        |  4 ++--
 packages/types/src/blocks/props/core-code.ts           |  3 ++-
 packages/types/src/blocks/props/core-column.ts         |  4 ++--
 packages/types/src/blocks/props/core-columns.ts        |  4 ++--
 packages/types/src/blocks/props/core-cover.ts          |  4 ++--
 packages/types/src/blocks/props/core-details.ts        |  4 ++--
 packages/types/src/blocks/props/core-file.ts           |  3 ++-
 packages/types/src/blocks/props/core-freeform.ts       |  3 ++-
 packages/types/src/blocks/props/core-gallery.ts        |  4 ++--
 packages/types/src/blocks/props/core-group.ts          |  4 ++--
 packages/types/src/blocks/props/core-heading.ts        |  3 ++-
 packages/types/src/blocks/props/core-html.ts           |  3 ++-
 packages/types/src/blocks/props/core-image.ts          |  4 ++--
 packages/types/src/blocks/props/core-list-item.ts      |  4 ++--
 packages/types/src/blocks/props/core-list.ts           |  4 ++--
 packages/types/src/blocks/props/core-media-text.ts     |  4 ++--
 packages/types/src/blocks/props/core-paragraph.ts      |  3 ++-
 packages/types/src/blocks/props/core-pattern.ts        |  4 ++--
 packages/types/src/blocks/props/core-post-content.ts   |  4 ++--
 packages/types/src/blocks/props/core-preformatted.ts   |  3 ++-
 packages/types/src/blocks/props/core-pullquote.ts      |  3 ++-
 packages/types/src/blocks/props/core-quote.ts          |  4 ++--
 packages/types/src/blocks/props/core-separator.ts      |  3 ++-
 packages/types/src/blocks/props/core-spacer.ts         |  3 ++-
 packages/types/src/blocks/props/core-template-part.ts  |  4 ++--
 packages/types/src/blocks/props/core-verse.ts          |  3 ++-
 packages/types/src/blocks/props/core-video.ts          |  3 ++-
 packages/types/src/blocks/props/default.ts             |  3 ++-
 75 files changed, 161 insertions(+), 117 deletions(-)

diff --git a/packages/blocks/src/blocks/core-audio.tsx b/packages/blocks/src/blocks/core-audio.tsx
index b95e6d51..b4c22f7f 100644
--- a/packages/blocks/src/blocks/core-audio.tsx
+++ b/packages/blocks/src/blocks/core-audio.tsx
@@ -4,6 +4,7 @@ import {
 	getStylesFromAttributes,
 } from '@snapwp/core';
 import type { CoreAudio as CoreAudioType, CoreAudioProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/audio block.
@@ -17,7 +18,7 @@ import type { CoreAudio as CoreAudioType, CoreAudioProps } from '@snapwp/types';
 const CoreAudio: CoreAudioType = ( {
 	attributes,
 	renderedHtml,
-}: CoreAudioProps ): React.ReactNode => {
+}: CoreAudioProps ): ReactNode => {
 	const { autoplay, caption, loop, preload, src, style } = attributes || {};
 
 	if ( ! src ) {
diff --git a/packages/blocks/src/blocks/core-button.tsx b/packages/blocks/src/blocks/core-button.tsx
index 371625e5..aad3ea4a 100644
--- a/packages/blocks/src/blocks/core-button.tsx
+++ b/packages/blocks/src/blocks/core-button.tsx
@@ -4,7 +4,7 @@ import type {
 	CoreButton as CoreButtonType,
 	CoreButtonProps,
 } from '@snapwp/types';
-import type { ButtonHTMLAttributes } from 'react';
+import type { ButtonHTMLAttributes, ReactNode } from 'react';
 
 /**
  * Renders the core/button block.
@@ -16,7 +16,7 @@ import type { ButtonHTMLAttributes } from 'react';
  */
 const CoreButton: CoreButtonType = ( {
 	attributes,
-}: CoreButtonProps ): React.ReactNode => {
+}: CoreButtonProps ): ReactNode => {
 	const {
 		buttonType,
 		cssClassName,
diff --git a/packages/blocks/src/blocks/core-buttons.tsx b/packages/blocks/src/blocks/core-buttons.tsx
index 2e0386c1..34d004dd 100644
--- a/packages/blocks/src/blocks/core-buttons.tsx
+++ b/packages/blocks/src/blocks/core-buttons.tsx
@@ -3,6 +3,7 @@ import type {
 	CoreButtons as CoreButtonsType,
 	CoreButtonsProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/buttons block.
@@ -16,7 +17,7 @@ import type {
 const CoreButtons: CoreButtonsType = ( {
 	attributes,
 	children,
-}: CoreButtonsProps ): React.ReactNode => {
+}: CoreButtonsProps ): ReactNode => {
 	const { cssClassName, style } = attributes || {};
 	const classNames = cn( cssClassName );
 
diff --git a/packages/blocks/src/blocks/core-code.tsx b/packages/blocks/src/blocks/core-code.tsx
index dafdf268..17b168d4 100644
--- a/packages/blocks/src/blocks/core-code.tsx
+++ b/packages/blocks/src/blocks/core-code.tsx
@@ -1,6 +1,7 @@
 import { getStylesFromAttributes } from '@snapwp/core';
 import { Parse } from '@snapwp/next';
 import type { CoreCode as CoreCodeType, CoreCodeProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/code block.
@@ -10,9 +11,7 @@ import type { CoreCode as CoreCodeType, CoreCodeProps } from '@snapwp/types';
  *
  * @return The rendered block.
  */
-const CoreCode: CoreCodeType = ( {
-	attributes,
-}: CoreCodeProps ): React.ReactNode => {
+const CoreCode: CoreCodeType = ( { attributes }: CoreCodeProps ): ReactNode => {
 	const { style, cssClassName, content } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-column.tsx b/packages/blocks/src/blocks/core-column.tsx
index 32922c50..b8b9a66f 100644
--- a/packages/blocks/src/blocks/core-column.tsx
+++ b/packages/blocks/src/blocks/core-column.tsx
@@ -3,7 +3,7 @@ import type {
 	CoreColumn as CoreColumnType,
 	CoreColumnProps,
 } from '@snapwp/types';
-import type { CSSProperties } from 'react';
+import type { CSSProperties, ReactNode } from 'react';
 
 /**
  * Renders the core/column block.
@@ -17,7 +17,7 @@ import type { CSSProperties } from 'react';
 const CoreColumn: CoreColumnType = ( {
 	attributes,
 	children,
-}: CoreColumnProps ): React.ReactNode => {
+}: CoreColumnProps ): ReactNode => {
 	const { cssClassName, style, width } = attributes || {};
 
 	const classNames = cn( cssClassName );
diff --git a/packages/blocks/src/blocks/core-columns.tsx b/packages/blocks/src/blocks/core-columns.tsx
index 868e495d..e27ec0f8 100644
--- a/packages/blocks/src/blocks/core-columns.tsx
+++ b/packages/blocks/src/blocks/core-columns.tsx
@@ -3,6 +3,7 @@ import type {
 	CoreColumns as CoreColumnsType,
 	CoreColumnsProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/columns block.
@@ -16,7 +17,7 @@ import type {
 const CoreColumns: CoreColumnsType = ( {
 	attributes,
 	children,
-}: CoreColumnsProps ): React.ReactNode => {
+}: CoreColumnsProps ): ReactNode => {
 	const { cssClassName, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-cover.tsx b/packages/blocks/src/blocks/core-cover.tsx
index 080e875f..a4cdd596 100644
--- a/packages/blocks/src/blocks/core-cover.tsx
+++ b/packages/blocks/src/blocks/core-cover.tsx
@@ -53,7 +53,7 @@ const CoreCover: CoreCoverType = ( {
 	mediaDetails,
 	children,
 	renderedHtml,
-}: CoreCoverProps ): React.ReactNode => {
+}: CoreCoverProps ): ReactNode => {
 	// Rest of the component implementation remains unchanged
 	const {
 		alt,
diff --git a/packages/blocks/src/blocks/core-details.tsx b/packages/blocks/src/blocks/core-details.tsx
index 8276f204..e9be0611 100644
--- a/packages/blocks/src/blocks/core-details.tsx
+++ b/packages/blocks/src/blocks/core-details.tsx
@@ -7,6 +7,7 @@ import type {
 	CoreDetails as CoreDetailsType,
 	CoreDetailsProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/details block.
@@ -22,7 +23,7 @@ const CoreDetails: CoreDetailsType = ( {
 	attributes,
 	children,
 	renderedHtml,
-}: CoreDetailsProps ): React.ReactNode => {
+}: CoreDetailsProps ): ReactNode => {
 	const { style, showContent, summary } = attributes ?? {};
 	const styleObject = getStylesFromAttributes( { style } );
 
diff --git a/packages/blocks/src/blocks/core-file.tsx b/packages/blocks/src/blocks/core-file.tsx
index e86eb832..86ff630c 100644
--- a/packages/blocks/src/blocks/core-file.tsx
+++ b/packages/blocks/src/blocks/core-file.tsx
@@ -5,6 +5,7 @@ import {
 } from '@snapwp/core';
 import { Link, Parse } from '@snapwp/next';
 import type { CoreFile as CoreFileType, CoreFileProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 const FALLBACK_DOWNLOAD_BUTTON_TEXT = 'Download';
 const FALLBACK_ARIA_LABEL = 'PDF embed';
@@ -21,7 +22,7 @@ const FALLBACK_ARIA_LABEL = 'PDF embed';
 const CoreFile: CoreFileType = ( {
 	attributes,
 	renderedHtml,
-}: CoreFileProps ): React.ReactNode => {
+}: CoreFileProps ): ReactNode => {
 	const {
 		displayPreview,
 		downloadButtonText,
diff --git a/packages/blocks/src/blocks/core-freeform.tsx b/packages/blocks/src/blocks/core-freeform.tsx
index 07aa235b..72ff3aef 100644
--- a/packages/blocks/src/blocks/core-freeform.tsx
+++ b/packages/blocks/src/blocks/core-freeform.tsx
@@ -3,6 +3,7 @@ import type {
 	CoreFreeform as CoreFreeformType,
 	CoreFreeformProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/freeform block.
@@ -14,7 +15,7 @@ import type {
  */
 const CoreFreeform: CoreFreeformType = ( {
 	renderedHtml,
-}: CoreFreeformProps ): React.ReactNode => {
+}: CoreFreeformProps ): ReactNode => {
 	// @todo `attribues.content` is not populated in GraphQL. Using `renderedHtml` for now.
 	if ( ! renderedHtml ) {
 		return null;
diff --git a/packages/blocks/src/blocks/core-gallery.tsx b/packages/blocks/src/blocks/core-gallery.tsx
index 67fbd636..b886e7cc 100644
--- a/packages/blocks/src/blocks/core-gallery.tsx
+++ b/packages/blocks/src/blocks/core-gallery.tsx
@@ -7,6 +7,7 @@ import type {
 	CoreGallery as CoreGalleryType,
 	CoreGalleryProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/gallery block.
@@ -22,7 +23,7 @@ const CoreGallery: CoreGalleryType = ( {
 	attributes,
 	children,
 	renderedHtml,
-}: CoreGalleryProps ): React.ReactNode => {
+}: CoreGalleryProps ): ReactNode => {
 	const { caption, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-group.tsx b/packages/blocks/src/blocks/core-group.tsx
index 065c905b..89a90d73 100644
--- a/packages/blocks/src/blocks/core-group.tsx
+++ b/packages/blocks/src/blocks/core-group.tsx
@@ -2,6 +2,7 @@ import {
 	createElement,
 	type CSSProperties,
 	type PropsWithChildren,
+	type ReactNode,
 } from 'react';
 import {
 	cn,
@@ -30,7 +31,7 @@ const Tag = ( {
 	name?: string;
 	className: string;
 	style?: CSSProperties;
-} > ): React.ReactNode => {
+} > ): ReactNode => {
 	if ( ! name ) {
 		return <>{ children }</>;
 	}
@@ -52,7 +53,7 @@ const CoreGroup: CoreGroupType = ( {
 	attributes,
 	renderedHtml,
 	children,
-}: CoreGroupProps ): React.ReactNode => {
+}: CoreGroupProps ): ReactNode => {
 	const { style, tagName } = attributes ?? {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-heading.tsx b/packages/blocks/src/blocks/core-heading.tsx
index 0ec87091..1bf5d6a4 100644
--- a/packages/blocks/src/blocks/core-heading.tsx
+++ b/packages/blocks/src/blocks/core-heading.tsx
@@ -1,4 +1,4 @@
-import type { JSX } from 'react';
+import type { JSX, ReactNode } from 'react';
 import { getStylesFromAttributes } from '@snapwp/core';
 import { Parse } from '@snapwp/next';
 import type {
@@ -16,7 +16,7 @@ import type {
  */
 const CoreHeading: CoreHeadingType = ( {
 	attributes,
-}: CoreHeadingProps ): React.ReactNode => {
+}: CoreHeadingProps ): ReactNode => {
 	const { style, cssClassName, content, level } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-html.tsx b/packages/blocks/src/blocks/core-html.tsx
index 3089c0dc..b2751612 100644
--- a/packages/blocks/src/blocks/core-html.tsx
+++ b/packages/blocks/src/blocks/core-html.tsx
@@ -1,5 +1,6 @@
 import { Parse } from '@snapwp/next';
 import type { CoreHtml as CoreHtmlType, CoreHtmlProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/html block.
@@ -11,7 +12,7 @@ import type { CoreHtml as CoreHtmlType, CoreHtmlProps } from '@snapwp/types';
  */
 const CoreHtml: CoreHtmlType = ( {
 	renderedHtml,
-}: CoreHtmlProps ): React.ReactNode => {
+}: CoreHtmlProps ): ReactNode => {
 	// @todo use attributes.content instead of renderedHtml once it's available
 	if ( ! renderedHtml ) {
 		return null;
diff --git a/packages/blocks/src/blocks/core-image.tsx b/packages/blocks/src/blocks/core-image.tsx
index 42622a24..bb72bde1 100644
--- a/packages/blocks/src/blocks/core-image.tsx
+++ b/packages/blocks/src/blocks/core-image.tsx
@@ -1,5 +1,5 @@
 import { decode } from 'html-entities';
-import type { ComponentProps, CSSProperties } from 'react';
+import type { ComponentProps, CSSProperties, ReactNode } from 'react';
 import {
 	cn,
 	getClassNamesFromString,
@@ -39,7 +39,7 @@ const Figure = ( {
 	linkTarget,
 	rel,
 	lightbox,
-}: FigureProps ): React.ReactNode => {
+}: FigureProps ): ReactNode => {
 	let props: ComponentProps< 'figure' > = {};
 
 	if ( isLightboxEnabled( lightbox ) ) {
@@ -85,7 +85,7 @@ const CoreImage: CoreImageType = ( {
 	connectedMediaItem,
 	mediaDetails,
 	renderedHtml,
-}: CoreImageProps ): React.ReactNode => {
+}: CoreImageProps ): ReactNode => {
 	// @todo: fetchPriority is missing
 	const { caption, url, lightbox } = attributes || {};
 
diff --git a/packages/blocks/src/blocks/core-list-item.tsx b/packages/blocks/src/blocks/core-list-item.tsx
index 29e8f583..7d562f6c 100644
--- a/packages/blocks/src/blocks/core-list-item.tsx
+++ b/packages/blocks/src/blocks/core-list-item.tsx
@@ -8,6 +8,7 @@ import type {
 	CoreListItem as CoreListItemType,
 	CoreListItemProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/list-item block.
@@ -23,7 +24,7 @@ const CoreListItem: CoreListItemType = ( {
 	attributes,
 	renderedHtml,
 	children,
-}: CoreListItemProps ): React.ReactNode => {
+}: CoreListItemProps ): ReactNode => {
 	const { content, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-list.tsx b/packages/blocks/src/blocks/core-list.tsx
index 5e90f3d4..0fd5ce25 100644
--- a/packages/blocks/src/blocks/core-list.tsx
+++ b/packages/blocks/src/blocks/core-list.tsx
@@ -1,6 +1,6 @@
 import { cn, getStylesFromAttributes } from '@snapwp/core';
 import type { CoreList as CoreListType, CoreListProps } from '@snapwp/types';
-import type { CSSProperties } from 'react';
+import type { CSSProperties, ReactNode } from 'react';
 
 /**
  * Renders the core/list block.
@@ -14,7 +14,7 @@ import type { CSSProperties } from 'react';
 const CoreList: CoreListType = ( {
 	attributes,
 	children,
-}: CoreListProps ): React.ReactNode => {
+}: CoreListProps ): ReactNode => {
 	const { cssClassName, ordered, reversed, start, style, type } =
 		attributes || {};
 
diff --git a/packages/blocks/src/blocks/core-media-text.tsx b/packages/blocks/src/blocks/core-media-text.tsx
index 1d8e10ad..d929b794 100644
--- a/packages/blocks/src/blocks/core-media-text.tsx
+++ b/packages/blocks/src/blocks/core-media-text.tsx
@@ -1,4 +1,4 @@
-import type { ComponentProps } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 import {
 	cn,
 	getClassNamesFromString,
@@ -64,7 +64,7 @@ const CoreMediaText: CoreMediaTextType = ( {
 	renderedHtml,
 	connectedMediaItem,
 	mediaDetails,
-}: CoreMediaTextProps ): React.ReactNode => {
+}: CoreMediaTextProps ): ReactNode => {
 	// If there is no media URL or children, render the parsed HTML
 	if ( ! attributes?.mediaUrl && ! children ) {
 		return <Parse html={ renderedHtml || '' } />;
diff --git a/packages/blocks/src/blocks/core-paragraph.tsx b/packages/blocks/src/blocks/core-paragraph.tsx
index 68692130..9d9ed778 100644
--- a/packages/blocks/src/blocks/core-paragraph.tsx
+++ b/packages/blocks/src/blocks/core-paragraph.tsx
@@ -4,6 +4,7 @@ import type {
 	CoreParagraph as CoreParagraphType,
 	CoreParagraphProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/paragraph block.
@@ -15,7 +16,7 @@ import type {
  */
 const CoreParagraph: CoreParagraphType = ( {
 	attributes,
-}: CoreParagraphProps ): React.ReactNode => {
+}: CoreParagraphProps ): ReactNode => {
 	const {
 		backgroundColor,
 		content,
diff --git a/packages/blocks/src/blocks/core-pattern.tsx b/packages/blocks/src/blocks/core-pattern.tsx
index 5b24651a..1c040826 100644
--- a/packages/blocks/src/blocks/core-pattern.tsx
+++ b/packages/blocks/src/blocks/core-pattern.tsx
@@ -2,6 +2,7 @@ import type {
 	CorePattern as CorePatternType,
 	CorePatternProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/pattern block.
@@ -13,7 +14,7 @@ import type {
  */
 const CorePattern: CorePatternType = ( {
 	children,
-}: CorePatternProps ): React.ReactNode => {
+}: CorePatternProps ): ReactNode => {
 	// Patterns contain only children, so we just return them.
 	return <>{ children }</>;
 };
diff --git a/packages/blocks/src/blocks/core-post-content.tsx b/packages/blocks/src/blocks/core-post-content.tsx
index 72a0b08e..bf36c805 100644
--- a/packages/blocks/src/blocks/core-post-content.tsx
+++ b/packages/blocks/src/blocks/core-post-content.tsx
@@ -3,6 +3,7 @@ import type {
 	CorePostContent as CorePostContentType,
 	CorePostContentProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/post-content block.
@@ -16,7 +17,7 @@ import type {
 const CorePostContent: CorePostContentType = ( {
 	renderedHtml,
 	children,
-}: CorePostContentProps ): React.ReactNode => {
+}: CorePostContentProps ): ReactNode => {
 	/**
 	 * @todo replace with cssClassName once it's supported.
 	 */
diff --git a/packages/blocks/src/blocks/core-preformatted.tsx b/packages/blocks/src/blocks/core-preformatted.tsx
index 6677966a..1ad71f80 100644
--- a/packages/blocks/src/blocks/core-preformatted.tsx
+++ b/packages/blocks/src/blocks/core-preformatted.tsx
@@ -8,6 +8,7 @@ import type {
 	CorePreformatted as CorePreformattedType,
 	CorePreformattedProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/preformatted block.
@@ -21,7 +22,7 @@ import type {
 const CorePreformatted: CorePreformattedType = ( {
 	attributes,
 	renderedHtml,
-}: CorePreformattedProps ): React.ReactNode => {
+}: CorePreformattedProps ): ReactNode => {
 	const { content, style } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-pullquote.tsx b/packages/blocks/src/blocks/core-pullquote.tsx
index 1131adaa..4985c902 100644
--- a/packages/blocks/src/blocks/core-pullquote.tsx
+++ b/packages/blocks/src/blocks/core-pullquote.tsx
@@ -8,6 +8,7 @@ import type {
 	CorePullquote as CorePullquoteType,
 	CorePullquoteProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/pullquote block.
@@ -21,7 +22,7 @@ import type {
 const CorePullquote: CorePullquoteType = ( {
 	attributes,
 	renderedHtml,
-}: CorePullquoteProps ): React.ReactNode => {
+}: CorePullquoteProps ): ReactNode => {
 	const { style, pullquoteValue, citation } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-quote.tsx b/packages/blocks/src/blocks/core-quote.tsx
index e717355c..a669e549 100644
--- a/packages/blocks/src/blocks/core-quote.tsx
+++ b/packages/blocks/src/blocks/core-quote.tsx
@@ -1,6 +1,7 @@
 import { getStylesFromAttributes } from '@snapwp/core';
 import { Parse } from '@snapwp/next';
 import type { CoreQuote as CoreQuoteType, CoreQuoteProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/quote block.
@@ -14,7 +15,7 @@ import type { CoreQuote as CoreQuoteType, CoreQuoteProps } from '@snapwp/types';
 const CoreQuote: CoreQuoteType = ( {
 	attributes,
 	children,
-}: CoreQuoteProps ): React.ReactNode => {
+}: CoreQuoteProps ): ReactNode => {
 	const { style, citation, cssClassName } = attributes || {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-separator.tsx b/packages/blocks/src/blocks/core-separator.tsx
index c6ecefab..25e7497d 100644
--- a/packages/blocks/src/blocks/core-separator.tsx
+++ b/packages/blocks/src/blocks/core-separator.tsx
@@ -3,6 +3,7 @@ import type {
 	CoreSeparator as CoreSeparatorType,
 	CoreSeparatorProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/separator block.
@@ -14,7 +15,7 @@ import type {
  */
 const CoreSeparator: CoreSeparatorType = ( {
 	renderedHtml,
-}: CoreSeparatorProps ): React.ReactNode => {
+}: CoreSeparatorProps ): ReactNode => {
 	const classes = getClassNamesFromString( renderedHtml || '' ).join( ' ' );
 	return <hr className={ classes } />;
 };
diff --git a/packages/blocks/src/blocks/core-spacer.tsx b/packages/blocks/src/blocks/core-spacer.tsx
index 8226101c..06e3cd75 100644
--- a/packages/blocks/src/blocks/core-spacer.tsx
+++ b/packages/blocks/src/blocks/core-spacer.tsx
@@ -8,6 +8,7 @@ import type {
 	CoreSpacer as CoreSpacerType,
 	CoreSpacerProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/spacer block.
@@ -21,7 +22,7 @@ import type {
 const CoreSpacer: CoreSpacerType = ( {
 	attributes,
 	renderedHtml,
-}: CoreSpacerProps ): React.ReactNode => {
+}: CoreSpacerProps ): ReactNode => {
 	const { height, width, style } = attributes || {};
 
 	const parsedStyle = style ? JSON.parse( style ) : {};
diff --git a/packages/blocks/src/blocks/core-template-part.tsx b/packages/blocks/src/blocks/core-template-part.tsx
index 7b633948..7f084893 100644
--- a/packages/blocks/src/blocks/core-template-part.tsx
+++ b/packages/blocks/src/blocks/core-template-part.tsx
@@ -1,4 +1,4 @@
-import type { JSX } from 'react';
+import type { JSX, ReactNode } from 'react';
 import { cn, getClassNamesFromString } from '@snapwp/core';
 import type {
 	CoreTemplatePart as CoreTemplatePartType,
@@ -19,7 +19,7 @@ const CoreTemplatePart: CoreTemplatePartType = ( {
 	renderedHtml,
 	children,
 	attributes,
-}: CoreTemplatePartProps ): React.ReactNode => {
+}: CoreTemplatePartProps ): ReactNode => {
 	const { templatePartTagName, area } = attributes || {};
 
 	const htmlTag = templatePartTagName || area || 'div';
diff --git a/packages/blocks/src/blocks/core-verse.tsx b/packages/blocks/src/blocks/core-verse.tsx
index 1e2cea7a..50decfbe 100644
--- a/packages/blocks/src/blocks/core-verse.tsx
+++ b/packages/blocks/src/blocks/core-verse.tsx
@@ -5,6 +5,7 @@ import {
 } from '@snapwp/core';
 import { Parse } from '@snapwp/next';
 import type { CoreVerse as CoreVerseType, CoreVerseProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the core/verse block.
@@ -18,7 +19,7 @@ import type { CoreVerse as CoreVerseType, CoreVerseProps } from '@snapwp/types';
 const CoreVerse: CoreVerseType = ( {
 	attributes,
 	renderedHtml,
-}: CoreVerseProps ): React.ReactNode => {
+}: CoreVerseProps ): ReactNode => {
 	const { style, content } = attributes ?? {};
 
 	const styleObject = getStylesFromAttributes( { style } );
diff --git a/packages/blocks/src/blocks/core-video.tsx b/packages/blocks/src/blocks/core-video.tsx
index 3d7c4bee..2e12ab9c 100644
--- a/packages/blocks/src/blocks/core-video.tsx
+++ b/packages/blocks/src/blocks/core-video.tsx
@@ -9,6 +9,7 @@ import type {
 	CoreVideoProps,
 	TrackProps,
 } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders a list of `<track>` elements for a video.
@@ -22,7 +23,7 @@ const Tracks = ( {
 	tracks,
 }: {
 	tracks?: TrackProps[] | undefined;
-} ): React.ReactNode => {
+} ): ReactNode => {
 	if ( ! tracks || tracks.length === 0 ) {
 		return null;
 	}
@@ -53,7 +54,7 @@ const Tracks = ( {
 const CoreVideo: CoreVideoType = ( {
 	attributes,
 	renderedHtml,
-}: CoreVideoProps ): React.ReactNode => {
+}: CoreVideoProps ): ReactNode => {
 	const {
 		autoplay,
 		caption,
diff --git a/packages/blocks/src/blocks/default.tsx b/packages/blocks/src/blocks/default.tsx
index 28281ae9..ae8b59ce 100644
--- a/packages/blocks/src/blocks/default.tsx
+++ b/packages/blocks/src/blocks/default.tsx
@@ -1,5 +1,6 @@
 import { Parse } from '@snapwp/next';
 import type { Default as DefaultType, DefaultProps } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the default block.
@@ -8,9 +9,7 @@ import type { Default as DefaultType, DefaultProps } from '@snapwp/types';
  *
  * @return The rendered default block.
  */
-const Default: DefaultType = ( {
-	renderedHtml,
-}: DefaultProps ): React.ReactNode => {
+const Default: DefaultType = ( { renderedHtml }: DefaultProps ): ReactNode => {
 	if ( ! renderedHtml ) {
 		return null;
 	}
diff --git a/packages/blocks/src/editor-blocks-renderer/index.tsx b/packages/blocks/src/editor-blocks-renderer/index.tsx
index 007adcd1..9633545a 100644
--- a/packages/blocks/src/editor-blocks-renderer/index.tsx
+++ b/packages/blocks/src/editor-blocks-renderer/index.tsx
@@ -2,6 +2,7 @@ import BlockManager from '@/block-manager';
 import { getConfig } from '@snapwp/core/config';
 
 import type { BlockData, BlockDefinitions, BlockTreeNode } from '@snapwp/types';
+import type { ReactNode } from 'react';
 
 type EditorBlocksRendererProps = {
 	editorBlocks?: BlockData[] | null | undefined;
@@ -19,7 +20,7 @@ type EditorBlocksRendererProps = {
 export default function EditorBlocksRenderer( {
 	editorBlocks,
 	blockDefinitions,
-}: EditorBlocksRendererProps ): React.ReactNode {
+}: EditorBlocksRendererProps ): ReactNode {
 	const { blockDefinitions: globalBlockDefinitions } = getConfig();
 
 	const resolvedBlockDefinitions = globalBlockDefinitions ?? blockDefinitions;
@@ -31,7 +32,7 @@ export default function EditorBlocksRenderer( {
 	const parsedTree = BlockManager.parseBlockForRendering( editorBlocks );
 
 	// eslint-disable-next-line jsdoc/require-jsdoc -- Disable jsdoc for local function.
-	const renderNode = ( node: BlockTreeNode ): React.ReactNode => {
+	const renderNode = ( node: BlockTreeNode ): ReactNode => {
 		const props: Record< string, unknown > = {
 			key: node.clientId,
 			...node,
diff --git a/packages/next/src/components/default-error.tsx b/packages/next/src/components/default-error.tsx
index 255c1446..27ae33d9 100644
--- a/packages/next/src/components/default-error.tsx
+++ b/packages/next/src/components/default-error.tsx
@@ -1,5 +1,7 @@
 'use client';
 
+import type { ReactNode } from 'react';
+
 /**
  * Default error component.
  *
@@ -18,7 +20,7 @@ export default function DefaultError( {
 }: {
 	error: Error & { digest?: string };
 	reset: () => void;
-} ): React.ReactNode {
+} ): ReactNode {
 	const unknownError =
 		'An unexpected error has occurred. Please check the logs for more details.';
 	const tryAgain = 'Try Again';
diff --git a/packages/next/src/components/font.tsx b/packages/next/src/components/font.tsx
index 590a3718..b0319046 100644
--- a/packages/next/src/components/font.tsx
+++ b/packages/next/src/components/font.tsx
@@ -1,3 +1,5 @@
+import type { ReactNode } from 'react';
+
 /**
  * A wrapper for loading fonts dynamically using next/font.
  *
@@ -10,7 +12,7 @@
  */
 export default function Fonts( props: {
 	renderedFontFaces: string;
-} ): React.ReactNode {
+} ): ReactNode {
 	const { renderedFontFaces } = props;
 
 	// @todo: we might need to proxy these for CORS.
diff --git a/packages/next/src/components/image.tsx b/packages/next/src/components/image.tsx
index 73eb6012..5a6affe3 100644
--- a/packages/next/src/components/image.tsx
+++ b/packages/next/src/components/image.tsx
@@ -2,6 +2,7 @@ import {
 	type CSSProperties,
 	type ImgHTMLAttributes,
 	type PropsWithoutRef,
+	type ReactNode,
 } from 'react';
 import NextImage, { type ImageProps } from 'next/image';
 import { cn } from '@snapwp/core';
@@ -60,7 +61,7 @@ export default function Image( {
 	...props
 }: PropsWithoutRef<
 	ImageInterface & ( ImageProps | ImgHTMLAttributes< HTMLImageElement > )
-> ): React.ReactNode {
+> ): ReactNode {
 	const altText = alt || image?.altText || '';
 	const originalWidth = image?.mediaDetails?.width;
 	const originalHeight = image?.mediaDetails?.height;
diff --git a/packages/next/src/components/link.tsx b/packages/next/src/components/link.tsx
index 63a5e870..c277d8bd 100644
--- a/packages/next/src/components/link.tsx
+++ b/packages/next/src/components/link.tsx
@@ -2,6 +2,7 @@ import {
 	type AnchorHTMLAttributes,
 	type CSSProperties,
 	type PropsWithChildren,
+	type ReactNode,
 } from 'react';
 import { toFrontendUri, isInternalUrl } from '@snapwp/core';
 import { getConfig } from '@snapwp/core/config';
@@ -37,7 +38,7 @@ export default function Link( {
 			| AnchorHTMLAttributes< HTMLAnchorElement >
 			| PartialWithUndefined< LinkProps >
 		)
-> ): React.ReactNode {
+> ): ReactNode {
 	const { graphqlEndpoint } = getConfig();
 
 	const internalUri = href
diff --git a/packages/next/src/components/script-module.tsx b/packages/next/src/components/script-module.tsx
index 03669a71..abda3e89 100644
--- a/packages/next/src/components/script-module.tsx
+++ b/packages/next/src/components/script-module.tsx
@@ -5,7 +5,7 @@
  * This component ensures that all dependencies of a script module are loaded before the main script.
  * Dependencies are rendered as individual <Script /> components and are typically loaded asynchronously.
  */
-import type { PropsWithoutRef } from 'react';
+import type { PropsWithoutRef, ReactNode } from 'react';
 import Script from 'next/script';
 
 interface ScriptModuleInterface {
@@ -42,7 +42,7 @@ export default function ScriptModule( {
 	dependencies,
 	extraData,
 	...props
-}: PropsWithoutRef< ScriptModuleInterface > ): React.ReactNode {
+}: PropsWithoutRef< ScriptModuleInterface > ): ReactNode {
 	// Generate dependency scripts
 	const DependencyScripts = dependencies?.map( ( dep, index ) => {
 		if ( ! dep?.connectedScriptModule ) {
diff --git a/packages/next/src/components/script.tsx b/packages/next/src/components/script.tsx
index 1b418179..72d3e79b 100644
--- a/packages/next/src/components/script.tsx
+++ b/packages/next/src/components/script.tsx
@@ -1,5 +1,5 @@
 import NextScript, { type ScriptProps } from 'next/script';
-import type { PropsWithoutRef } from 'react';
+import type { PropsWithoutRef, ReactNode } from 'react';
 
 interface ScriptInterface {
 	after?: ( string | null )[] | null | undefined;
@@ -34,7 +34,7 @@ export default function Script( {
 	src,
 	loadingStrategy,
 	...props
-}: PropsWithoutRef< ScriptInterface & ScriptProps > ): React.ReactNode {
+}: PropsWithoutRef< ScriptInterface & ScriptProps > ): ReactNode {
 	const beforeScript = Array.isArray( before )
 		? before.join( ' ' )
 		: undefined;
diff --git a/packages/next/src/react-parser/index.tsx b/packages/next/src/react-parser/index.tsx
index 2162a020..f3e65f87 100644
--- a/packages/next/src/react-parser/index.tsx
+++ b/packages/next/src/react-parser/index.tsx
@@ -2,6 +2,7 @@ import Parser from 'html-react-parser';
 import { getConfig } from '@snapwp/core/config';
 import { defaultOptions } from './options';
 import type { HTMLReactParserOptions } from 'html-react-parser';
+import type { ReactNode } from 'react';
 /**
  * Parses HTML string into React components.
  *
@@ -10,7 +11,7 @@ import type { HTMLReactParserOptions } from 'html-react-parser';
  *
  * @return The rendered React components.
  */
-export default function Parse( { html }: { html: string } ): React.ReactNode {
+export default function Parse( { html }: { html: string } ): ReactNode {
 	const {
 		parserOptions = defaultOptions,
 	}: { parserOptions?: HTMLReactParserOptions } = getConfig();
diff --git a/packages/next/src/root-layout/global-head.tsx b/packages/next/src/root-layout/global-head.tsx
index 368bdd61..ccb3484c 100644
--- a/packages/next/src/root-layout/global-head.tsx
+++ b/packages/next/src/root-layout/global-head.tsx
@@ -1,5 +1,6 @@
 import Fonts from '@/components/font';
 import { type GlobalHeadProps } from '@snapwp/core';
+import type { ReactNode } from 'react';
 
 /**
  * Renders the head section with custom styles, block styles, global stylesheet,
@@ -16,7 +17,7 @@ export function GlobalHead( {
 	customCss,
 	globalStylesheet,
 	renderedFontFaces,
-}: GlobalHeadProps ): React.ReactNode {
+}: GlobalHeadProps ): ReactNode {
 	return (
 		<>
 			{ globalStylesheet && (
diff --git a/packages/next/src/root-layout/index.tsx b/packages/next/src/root-layout/index.tsx
index 1634f8d5..2c057547 100644
--- a/packages/next/src/root-layout/index.tsx
+++ b/packages/next/src/root-layout/index.tsx
@@ -2,7 +2,7 @@ import { QueryEngine } from '@snapwp/query';
 import { GlobalHead } from './global-head';
 import { getIcons } from './icons-metadata';
 import type { Metadata } from 'next';
-import type { PropsWithChildren } from 'react';
+import type { PropsWithChildren, ReactNode } from 'react';
 
 export type RootLayoutProps = {
 	getGlobalStyles?: ( typeof QueryEngine )[ 'getGlobalStyles' ];
@@ -19,7 +19,7 @@ export type RootLayoutProps = {
 export async function RootLayout( {
 	getGlobalStyles = QueryEngine.getGlobalStyles,
 	children,
-}: PropsWithChildren< RootLayoutProps > ): Promise< React.ReactNode > {
+}: PropsWithChildren< RootLayoutProps > ): Promise< ReactNode > {
 	const globalHeadProps = await getGlobalStyles();
 
 	return (
diff --git a/packages/next/src/template-renderer/index.tsx b/packages/next/src/template-renderer/index.tsx
index 00eca010..c9107a27 100644
--- a/packages/next/src/template-renderer/index.tsx
+++ b/packages/next/src/template-renderer/index.tsx
@@ -24,7 +24,7 @@ export type TemplateRendererProps = {
 export async function TemplateRenderer( {
 	getTemplateData = QueryEngine.getTemplateData,
 	children,
-}: TemplateRendererProps ): Promise< React.ReactNode > {
+}: TemplateRendererProps ): Promise< ReactNode > {
 	const headerList = await headers(); // headers() returns a Promise from NextJS 19.
 	const pathname = headerList.get( 'x-current-path' );
 
diff --git a/packages/next/src/template-renderer/template-head.tsx b/packages/next/src/template-renderer/template-head.tsx
index 633b1a3c..1fa35d7f 100644
--- a/packages/next/src/template-renderer/template-head.tsx
+++ b/packages/next/src/template-renderer/template-head.tsx
@@ -1,4 +1,4 @@
-import { Fragment } from 'react';
+import { Fragment, type ReactNode } from 'react';
 import type { StyleSheetProps } from '@snapwp/core';
 
 export interface TemplateHeadProps {
@@ -13,9 +13,7 @@ export interface TemplateHeadProps {
  *
  * @return A head element containing the provided styles and links.
  */
-export function TemplateHead( {
-	stylesheets,
-}: TemplateHeadProps ): Array< React.ReactNode > | null {
+export function TemplateHead( { stylesheets }: TemplateHeadProps ): ReactNode {
 	if ( ! stylesheets ) {
 		return null;
 	}
diff --git a/packages/next/src/template-renderer/template-scripts.tsx b/packages/next/src/template-renderer/template-scripts.tsx
index 3ac1f9d9..9beea1ec 100644
--- a/packages/next/src/template-renderer/template-scripts.tsx
+++ b/packages/next/src/template-renderer/template-scripts.tsx
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { PropsWithChildren, ReactNode } from 'react';
 import NextScript from 'next/script';
 import Script from '@/components/script';
 import ScriptModule from '@/components/script-module';
@@ -17,7 +17,7 @@ const ScriptMap = ( {
 	scripts,
 }: {
 	scripts: EnqueuedScriptProps[];
-} ): React.ReactNode => (
+} ): ReactNode => (
 	<>
 		{ scripts?.map( ( { handle, src, ...rest }, id ) => {
 			return (
@@ -43,7 +43,7 @@ const ImportMap = ( {
 	scriptModules,
 }: {
 	scriptModules: ScriptModuleProps[];
-} ): React.ReactNode => {
+} ): ReactNode => {
 	// Generate import map from all module dependencies
 	const { wpHomeUrl, corsProxyPrefix } = getConfig();
 
@@ -92,7 +92,7 @@ const ScriptModuleMap = ( {
 	scriptModules,
 }: {
 	scriptModules?: ScriptModuleProps[];
-} ): React.ReactNode => {
+} ): ReactNode => {
 	const { wpHomeUrl, corsProxyPrefix } = getConfig();
 	// Array to store handles of script modules that should not be loaded
 	const uniqueScriptModuleDependencies = new Set< string >();
@@ -178,7 +178,7 @@ export function TemplateScripts( {
 }: PropsWithChildren< {
 	scripts: EnqueuedScriptProps[] | undefined;
 	scriptModules: ScriptModuleProps[] | undefined;
-} > ): React.ReactNode {
+} > ): ReactNode {
 	// Separate scripts by location
 	const headerScripts =
 		scripts?.filter( ( script ) => script.groupLocation === 'HEADER' ) ??
diff --git a/packages/types/src/blocks/base.ts b/packages/types/src/blocks/base.ts
index 14dac251..3179ca67 100644
--- a/packages/types/src/blocks/base.ts
+++ b/packages/types/src/blocks/base.ts
@@ -1,3 +1,5 @@
+import type { ComponentType } from 'react';
+
 export interface BaseAttributes {
 	[ key: string ]: unknown;
 }
@@ -8,7 +10,7 @@ export interface BaseProps< TAttributes > {
 	attributes?: TAttributes;
 }
 
-export type BaseBlock = React.ComponentType< BaseProps< BaseAttributes > >;
+export type BaseBlock = ComponentType< BaseProps< BaseAttributes > >;
 
 export interface BlockData<
 	T extends Record< string, unknown > = Record< string, unknown >,
@@ -27,5 +29,5 @@ export type BlockTreeNode< TBlockProps extends BlockData = BlockData > = Omit<
 > & {
 	children: BlockTreeNode[] | null;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- @todo Need to figure out the type of renderer (Type should not be any).
-	renderer: React.ComponentType< any >;
+	renderer: ComponentType< any >;
 };
diff --git a/packages/types/src/blocks/definitions.ts b/packages/types/src/blocks/definitions.ts
index bea4d6e8..fcaac89e 100644
--- a/packages/types/src/blocks/definitions.ts
+++ b/packages/types/src/blocks/definitions.ts
@@ -1,6 +1,8 @@
+import type { ComponentType } from 'react';
+
 export type BlockDefinitions = {
 	/* eslint-disable @typescript-eslint/no-explicit-any -- @todo Need to figure out the type of key & default. */
-	[ key: string ]: React.ComponentType< any > | undefined | null;
-	default: React.ComponentType< any > | undefined | null;
+	[ key: string ]: ComponentType< any > | undefined | null;
+	default: ComponentType< any > | undefined | null;
 	/* eslint-enable @typescript-eslint/no-explicit-any -- Re-enable ruleset. */
 };
diff --git a/packages/types/src/blocks/props/core-audio.ts b/packages/types/src/blocks/props/core-audio.ts
index 5001f6bc..d3e3e8dd 100644
--- a/packages/types/src/blocks/props/core-audio.ts
+++ b/packages/types/src/blocks/props/core-audio.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export type CoreAudioAttributes = BaseAttributes & {
@@ -11,4 +12,4 @@ export type CoreAudioAttributes = BaseAttributes & {
 
 export type CoreAudioProps = BaseProps< CoreAudioAttributes >;
 
-export type CoreAudio = React.ComponentType< CoreAudioProps >;
+export type CoreAudio = ComponentType< CoreAudioProps >;
diff --git a/packages/types/src/blocks/props/core-button.ts b/packages/types/src/blocks/props/core-button.ts
index 55e3b45e..a32d2110 100644
--- a/packages/types/src/blocks/props/core-button.ts
+++ b/packages/types/src/blocks/props/core-button.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export type CoreButtonAttributes = BaseAttributes & {
@@ -15,4 +16,4 @@ export type CoreButtonAttributes = BaseAttributes & {
 
 export type CoreButtonProps = BaseProps< CoreButtonAttributes >;
 
-export type CoreButton = React.ComponentType< CoreButtonProps >;
+export type CoreButton = ComponentType< CoreButtonProps >;
diff --git a/packages/types/src/blocks/props/core-buttons.ts b/packages/types/src/blocks/props/core-buttons.ts
index 0bcf787d..f5ec17cf 100644
--- a/packages/types/src/blocks/props/core-buttons.ts
+++ b/packages/types/src/blocks/props/core-buttons.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export type CoreButtonsAttributes = BaseAttributes & {
@@ -10,4 +10,4 @@ export type CoreButtonsProps = PropsWithChildren<
 	BaseProps< CoreButtonsAttributes >
 >;
 
-export type CoreButtons = React.ComponentType< CoreButtonsProps >;
+export type CoreButtons = ComponentType< CoreButtonsProps >;
diff --git a/packages/types/src/blocks/props/core-code.ts b/packages/types/src/blocks/props/core-code.ts
index 54f5cc94..fe42c911 100644
--- a/packages/types/src/blocks/props/core-code.ts
+++ b/packages/types/src/blocks/props/core-code.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export type CoreCodeAttributes = BaseAttributes & {
@@ -8,4 +9,4 @@ export type CoreCodeAttributes = BaseAttributes & {
 
 export type CoreCodeProps = BaseProps< CoreCodeAttributes >;
 
-export type CoreCode = React.ComponentType< CoreCodeProps >;
+export type CoreCode = ComponentType< CoreCodeProps >;
diff --git a/packages/types/src/blocks/props/core-column.ts b/packages/types/src/blocks/props/core-column.ts
index 71b498bf..2cedce71 100644
--- a/packages/types/src/blocks/props/core-column.ts
+++ b/packages/types/src/blocks/props/core-column.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export type CoreColumnAttributes = BaseAttributes & {
@@ -11,4 +11,4 @@ export type CoreColumnProps = PropsWithChildren<
 	BaseProps< CoreColumnAttributes >
 >;
 
-export type CoreColumn = React.ComponentType< CoreColumnProps >;
+export type CoreColumn = ComponentType< CoreColumnProps >;
diff --git a/packages/types/src/blocks/props/core-columns.ts b/packages/types/src/blocks/props/core-columns.ts
index 17508cc6..0dbe03ce 100644
--- a/packages/types/src/blocks/props/core-columns.ts
+++ b/packages/types/src/blocks/props/core-columns.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export type CoreColumnsAttributes = BaseAttributes & {
@@ -10,4 +10,4 @@ export type CoreColumnsProps = PropsWithChildren<
 	BaseProps< CoreColumnsAttributes >
 >;
 
-export type CoreColumns = React.ComponentType< CoreColumnsProps >;
+export type CoreColumns = ComponentType< CoreColumnsProps >;
diff --git a/packages/types/src/blocks/props/core-cover.ts b/packages/types/src/blocks/props/core-cover.ts
index 4e3123ee..b97f1677 100644
--- a/packages/types/src/blocks/props/core-cover.ts
+++ b/packages/types/src/blocks/props/core-cover.ts
@@ -1,4 +1,4 @@
-import type { ElementType, PropsWithChildren } from 'react';
+import type { ComponentType, ElementType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export interface FocalPoint {
@@ -51,4 +51,4 @@ export type CoreCoverProps = PropsWithChildren<
 	renderedHtml?: string | null;
 };
 
-export type CoreCover = React.ComponentType< CoreCoverProps >;
+export type CoreCover = ComponentType< CoreCoverProps >;
diff --git a/packages/types/src/blocks/props/core-details.ts b/packages/types/src/blocks/props/core-details.ts
index e5fdebce..f5ae70cf 100644
--- a/packages/types/src/blocks/props/core-details.ts
+++ b/packages/types/src/blocks/props/core-details.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreDetailsAttributes = BaseAttributes & {
@@ -11,4 +11,4 @@ export type CoreDetailsProps = PropsWithChildren<
 	BaseProps< CoreDetailsAttributes >
 >;
 
-export type CoreDetails = React.ComponentType< CoreDetailsProps >;
+export type CoreDetails = ComponentType< CoreDetailsProps >;
diff --git a/packages/types/src/blocks/props/core-file.ts b/packages/types/src/blocks/props/core-file.ts
index 2e28fdfe..ecbeea08 100644
--- a/packages/types/src/blocks/props/core-file.ts
+++ b/packages/types/src/blocks/props/core-file.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreFileAttributes = BaseAttributes & {
@@ -15,4 +16,4 @@ export type CoreFileAttributes = BaseAttributes & {
 
 export type CoreFileProps = BaseProps< CoreFileAttributes >;
 
-export type CoreFile = React.ComponentType< CoreFileProps >;
+export type CoreFile = ComponentType< CoreFileProps >;
diff --git a/packages/types/src/blocks/props/core-freeform.ts b/packages/types/src/blocks/props/core-freeform.ts
index 4d7b1587..283ef716 100644
--- a/packages/types/src/blocks/props/core-freeform.ts
+++ b/packages/types/src/blocks/props/core-freeform.ts
@@ -1,5 +1,6 @@
+import type { ComponentType } from 'react';
 import type { BaseProps } from '../base';
 
 export type CoreFreeformProps = BaseProps< {} >;
 
-export type CoreFreeform = React.ComponentType< CoreFreeformProps >;
+export type CoreFreeform = ComponentType< CoreFreeformProps >;
diff --git a/packages/types/src/blocks/props/core-gallery.ts b/packages/types/src/blocks/props/core-gallery.ts
index cf968cba..69a567d9 100644
--- a/packages/types/src/blocks/props/core-gallery.ts
+++ b/packages/types/src/blocks/props/core-gallery.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreGalleryAttributes = BaseAttributes & {
@@ -10,4 +10,4 @@ export type CoreGalleryProps = PropsWithChildren<
 	BaseProps< CoreGalleryAttributes >
 >;
 
-export type CoreGallery = React.ComponentType< CoreGalleryProps >;
+export type CoreGallery = ComponentType< CoreGalleryProps >;
diff --git a/packages/types/src/blocks/props/core-group.ts b/packages/types/src/blocks/props/core-group.ts
index 1cc13c0e..f1d7e939 100644
--- a/packages/types/src/blocks/props/core-group.ts
+++ b/packages/types/src/blocks/props/core-group.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreGroupAttributes = BaseAttributes & {
@@ -10,4 +10,4 @@ export type CoreGroupProps = PropsWithChildren<
 	BaseProps< CoreGroupAttributes >
 >;
 
-export type CoreGroup = React.ComponentType< CoreGroupProps >;
+export type CoreGroup = ComponentType< CoreGroupProps >;
diff --git a/packages/types/src/blocks/props/core-heading.ts b/packages/types/src/blocks/props/core-heading.ts
index 23a1cf32..305755e6 100644
--- a/packages/types/src/blocks/props/core-heading.ts
+++ b/packages/types/src/blocks/props/core-heading.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreHeadingAttributes = BaseAttributes & {
@@ -9,4 +10,4 @@ export type CoreHeadingAttributes = BaseAttributes & {
 
 export type CoreHeadingProps = BaseProps< CoreHeadingAttributes >;
 
-export type CoreHeading = React.ComponentType< CoreHeadingProps >;
+export type CoreHeading = ComponentType< CoreHeadingProps >;
diff --git a/packages/types/src/blocks/props/core-html.ts b/packages/types/src/blocks/props/core-html.ts
index f5086124..7939ba68 100644
--- a/packages/types/src/blocks/props/core-html.ts
+++ b/packages/types/src/blocks/props/core-html.ts
@@ -1,5 +1,6 @@
+import type { ComponentType } from 'react';
 import type { BaseProps } from '../base';
 
 export type CoreHtmlProps = BaseProps< {} >;
 
-export type CoreHtml = React.ComponentType< CoreHtmlProps >;
+export type CoreHtml = ComponentType< CoreHtmlProps >;
diff --git a/packages/types/src/blocks/props/core-image.ts b/packages/types/src/blocks/props/core-image.ts
index 5908cf90..646da590 100644
--- a/packages/types/src/blocks/props/core-image.ts
+++ b/packages/types/src/blocks/props/core-image.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreImageAttributes = BaseAttributes & {
@@ -24,7 +24,7 @@ export type CoreImageProps = BaseProps< CoreImageAttributes > & {
 	mediaDetails?: CoreImageMediaDetails;
 };
 
-export type CoreImage = React.ComponentType< CoreImageProps >;
+export type CoreImage = ComponentType< CoreImageProps >;
 
 export interface CoreImageConnectedMediaItem {
 	node: {
diff --git a/packages/types/src/blocks/props/core-list-item.ts b/packages/types/src/blocks/props/core-list-item.ts
index 1d8820fc..971f1e5a 100644
--- a/packages/types/src/blocks/props/core-list-item.ts
+++ b/packages/types/src/blocks/props/core-list-item.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreListItemAttributes = BaseAttributes & {
@@ -10,4 +10,4 @@ export type CoreListItemProps = PropsWithChildren<
 	BaseProps< CoreListItemAttributes >
 >;
 
-export type CoreListItem = React.ComponentType< CoreListItemProps >;
+export type CoreListItem = ComponentType< CoreListItemProps >;
diff --git a/packages/types/src/blocks/props/core-list.ts b/packages/types/src/blocks/props/core-list.ts
index f51757ef..e845d9ac 100644
--- a/packages/types/src/blocks/props/core-list.ts
+++ b/packages/types/src/blocks/props/core-list.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreListAttributes = BaseAttributes & {
@@ -14,4 +14,4 @@ export type CoreListProps = PropsWithChildren<
 	BaseProps< CoreListAttributes >
 >;
 
-export type CoreList = React.ComponentType< CoreListProps >;
+export type CoreList = ComponentType< CoreListProps >;
diff --git a/packages/types/src/blocks/props/core-media-text.ts b/packages/types/src/blocks/props/core-media-text.ts
index 3b837557..70e25b8d 100644
--- a/packages/types/src/blocks/props/core-media-text.ts
+++ b/packages/types/src/blocks/props/core-media-text.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 import type { FocalPoint } from '.';
 
@@ -27,7 +27,7 @@ export type CoreMediaTextProps = PropsWithChildren<
 	mediaDetails?: CoreMediaTextMediaDetails;
 };
 
-export type CoreMediaText = React.ComponentType< CoreMediaTextProps >;
+export type CoreMediaText = ComponentType< CoreMediaTextProps >;
 
 export interface CoreMediaTextConnectedMediaItem {
 	node: {
diff --git a/packages/types/src/blocks/props/core-paragraph.ts b/packages/types/src/blocks/props/core-paragraph.ts
index 7832f5ea..7a81d418 100644
--- a/packages/types/src/blocks/props/core-paragraph.ts
+++ b/packages/types/src/blocks/props/core-paragraph.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreParagraphAttributes = BaseAttributes & {
@@ -13,4 +14,4 @@ export type CoreParagraphAttributes = BaseAttributes & {
 
 export type CoreParagraphProps = BaseProps< CoreParagraphAttributes >;
 
-export type CoreParagraph = React.ComponentType< CoreParagraphProps >;
+export type CoreParagraph = ComponentType< CoreParagraphProps >;
diff --git a/packages/types/src/blocks/props/core-pattern.ts b/packages/types/src/blocks/props/core-pattern.ts
index f3747576..5a2b563e 100644
--- a/packages/types/src/blocks/props/core-pattern.ts
+++ b/packages/types/src/blocks/props/core-pattern.ts
@@ -1,6 +1,6 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseProps } from '../base';
 
 export type CorePatternProps = PropsWithChildren< BaseProps< {} > >;
 
-export type CorePattern = React.ComponentType< CorePatternProps >;
+export type CorePattern = ComponentType< CorePatternProps >;
diff --git a/packages/types/src/blocks/props/core-post-content.ts b/packages/types/src/blocks/props/core-post-content.ts
index 28805da6..6750f2ee 100644
--- a/packages/types/src/blocks/props/core-post-content.ts
+++ b/packages/types/src/blocks/props/core-post-content.ts
@@ -1,6 +1,6 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseProps } from '../base';
 
 export type CorePostContentProps = PropsWithChildren< BaseProps< {} > >;
 
-export type CorePostContent = React.ComponentType< CorePostContentProps >;
+export type CorePostContent = ComponentType< CorePostContentProps >;
diff --git a/packages/types/src/blocks/props/core-preformatted.ts b/packages/types/src/blocks/props/core-preformatted.ts
index 482ef5dd..a494f1f4 100644
--- a/packages/types/src/blocks/props/core-preformatted.ts
+++ b/packages/types/src/blocks/props/core-preformatted.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CorePreformattedAttributes = BaseAttributes & {
@@ -7,4 +8,4 @@ export type CorePreformattedAttributes = BaseAttributes & {
 
 export type CorePreformattedProps = BaseProps< CorePreformattedAttributes >;
 
-export type CorePreformatted = React.ComponentType< CorePreformattedProps >;
+export type CorePreformatted = ComponentType< CorePreformattedProps >;
diff --git a/packages/types/src/blocks/props/core-pullquote.ts b/packages/types/src/blocks/props/core-pullquote.ts
index be7d2893..36903993 100644
--- a/packages/types/src/blocks/props/core-pullquote.ts
+++ b/packages/types/src/blocks/props/core-pullquote.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CorePullquoteAttributes = BaseAttributes & {
@@ -9,4 +10,4 @@ export type CorePullquoteAttributes = BaseAttributes & {
 
 export type CorePullquoteProps = BaseProps< CorePullquoteAttributes >;
 
-export type CorePullquote = React.ComponentType< CorePullquoteProps >;
+export type CorePullquote = ComponentType< CorePullquoteProps >;
diff --git a/packages/types/src/blocks/props/core-quote.ts b/packages/types/src/blocks/props/core-quote.ts
index 8084bae1..cd1ee2cf 100644
--- a/packages/types/src/blocks/props/core-quote.ts
+++ b/packages/types/src/blocks/props/core-quote.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreQuoteAttributes = BaseAttributes & {
@@ -11,4 +11,4 @@ export type CoreQuoteProps = PropsWithChildren<
 	BaseProps< CoreQuoteAttributes >
 >;
 
-export type CoreQuote = React.ComponentType< CoreQuoteProps >;
+export type CoreQuote = ComponentType< CoreQuoteProps >;
diff --git a/packages/types/src/blocks/props/core-separator.ts b/packages/types/src/blocks/props/core-separator.ts
index b5c46819..79e9698f 100644
--- a/packages/types/src/blocks/props/core-separator.ts
+++ b/packages/types/src/blocks/props/core-separator.ts
@@ -1,5 +1,6 @@
+import type { ComponentType } from 'react';
 import type { BaseProps } from '../base';
 
 export type CoreSeparatorProps = BaseProps< {} >;
 
-export type CoreSeparator = React.ComponentType< CoreSeparatorProps >;
+export type CoreSeparator = ComponentType< CoreSeparatorProps >;
diff --git a/packages/types/src/blocks/props/core-spacer.ts b/packages/types/src/blocks/props/core-spacer.ts
index 8b002dba..1d6de970 100644
--- a/packages/types/src/blocks/props/core-spacer.ts
+++ b/packages/types/src/blocks/props/core-spacer.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreSpacerAttributes = BaseAttributes & {
@@ -8,4 +9,4 @@ export type CoreSpacerAttributes = BaseAttributes & {
 
 export type CoreSpacerProps = BaseProps< CoreSpacerAttributes >;
 
-export type CoreSpacer = React.ComponentType< CoreSpacerProps >;
+export type CoreSpacer = ComponentType< CoreSpacerProps >;
diff --git a/packages/types/src/blocks/props/core-template-part.ts b/packages/types/src/blocks/props/core-template-part.ts
index f4379060..1efc3f64 100644
--- a/packages/types/src/blocks/props/core-template-part.ts
+++ b/packages/types/src/blocks/props/core-template-part.ts
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreTemplatePartAttributes = BaseAttributes & {
@@ -10,4 +10,4 @@ export type CoreTemplatePartProps = PropsWithChildren<
 	BaseProps< CoreTemplatePartAttributes >
 >;
 
-export type CoreTemplatePart = React.ComponentType< CoreTemplatePartProps >;
+export type CoreTemplatePart = ComponentType< CoreTemplatePartProps >;
diff --git a/packages/types/src/blocks/props/core-verse.ts b/packages/types/src/blocks/props/core-verse.ts
index 92c647b4..1c802fd8 100644
--- a/packages/types/src/blocks/props/core-verse.ts
+++ b/packages/types/src/blocks/props/core-verse.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '../base';
 
 export type CoreVerseAttributes = BaseAttributes & {
@@ -7,4 +8,4 @@ export type CoreVerseAttributes = BaseAttributes & {
 
 export type CoreVerseProps = BaseProps< CoreVerseAttributes >;
 
-export type CoreVerse = React.ComponentType< CoreVerseProps >;
+export type CoreVerse = ComponentType< CoreVerseProps >;
diff --git a/packages/types/src/blocks/props/core-video.ts b/packages/types/src/blocks/props/core-video.ts
index 432b2907..71ec9203 100644
--- a/packages/types/src/blocks/props/core-video.ts
+++ b/packages/types/src/blocks/props/core-video.ts
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
 import type { BaseAttributes, BaseProps } from '..';
 
 export interface TrackProps {
@@ -23,4 +24,4 @@ export type CoreVideoAttributes = BaseAttributes & {
 
 export type CoreVideoProps = BaseProps< CoreVideoAttributes >;
 
-export type CoreVideo = React.ComponentType< CoreVideoProps >;
+export type CoreVideo = ComponentType< CoreVideoProps >;
diff --git a/packages/types/src/blocks/props/default.ts b/packages/types/src/blocks/props/default.ts
index 5f98eba7..ca0a5bee 100644
--- a/packages/types/src/blocks/props/default.ts
+++ b/packages/types/src/blocks/props/default.ts
@@ -1,5 +1,6 @@
+import type { ComponentType } from 'react';
 import type { BaseProps } from '../base';
 
 export type DefaultProps = BaseProps< {} >;
 
-export type Default = React.ComponentType< DefaultProps >;
+export type Default = ComponentType< DefaultProps >;

From dc1530a629440b2fcef587c0428ec045d991964a Mon Sep 17 00:00:00 2001
From: Dovid Levine <david@axepress.dev>
Date: Tue, 25 Mar 2025 18:33:17 +0200
Subject: [PATCH 10/11] fix: missing import

---
 packages/blocks/src/blocks/core-cover.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/blocks/src/blocks/core-cover.tsx b/packages/blocks/src/blocks/core-cover.tsx
index a4cdd596..71c4c2ee 100644
--- a/packages/blocks/src/blocks/core-cover.tsx
+++ b/packages/blocks/src/blocks/core-cover.tsx
@@ -1,4 +1,4 @@
-import type { ComponentProps } from 'react';
+import type { ComponentProps, ReactNode } from 'react';
 import {
 	getStylesFromAttributes,
 	findElementAndGetClassNames,

From 5d17c47d84cf13af8fbf41714a2bbc1ec5216d62 Mon Sep 17 00:00:00 2001
From: Dovid Levine <david@axepress.dev>
Date: Tue, 25 Mar 2025 18:38:08 +0200
Subject: [PATCH 11/11] chore: update changeset

---
 .changeset/polite-turkeys-check.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.changeset/polite-turkeys-check.md b/.changeset/polite-turkeys-check.md
index fee78565..abde4ada 100644
--- a/.changeset/polite-turkeys-check.md
+++ b/.changeset/polite-turkeys-check.md
@@ -2,6 +2,7 @@
 "@snapwp/e2e-tests": patch
 "@snapwp/blocks": patch
 "@snapwp/query": patch
+"@snapwp/types": patch
 "@snapwp/core": patch
 "@snapwp/next": patch
 ---