From 35d47fd8143175ca46f99f2c253ff6feed9a9ab7 Mon Sep 17 00:00:00 2001
From: Manzoor Wani <manzoorwani.jk@gmail.com>
Date: Tue, 29 Sep 2026 11:50:29 +0530
Subject: [PATCH 1/4] Components: Rename inner functions that shadow their
 component

typescript-eslint 8.60.1+ reports `const Foo = forwardRef( function Foo() {} )`
under no-shadow. Follow the documented `UnforwardedFoo` convention.
---
 packages/components/src/composite/group-label.tsx     | 2 +-
 packages/components/src/composite/group.tsx           | 2 +-
 packages/components/src/composite/hover.tsx           | 2 +-
 packages/components/src/composite/index.tsx           | 2 +-
 packages/components/src/composite/item.tsx            | 2 +-
 packages/components/src/composite/row.tsx             | 2 +-
 packages/components/src/composite/typeahead.tsx       | 2 +-
 packages/components/src/menu/checkbox-item.tsx        | 2 +-
 packages/components/src/menu/group.tsx                | 2 +-
 packages/components/src/menu/item-help-text.tsx       | 2 +-
 packages/components/src/menu/item-label.tsx           | 2 +-
 packages/components/src/menu/item.tsx                 | 2 +-
 packages/components/src/menu/popover.tsx              | 5 ++++-
 packages/components/src/menu/radio-item.tsx           | 2 +-
 packages/components/src/menu/separator.tsx            | 2 +-
 packages/components/src/menu/stories/index.story.tsx  | 8 ++++----
 packages/components/src/menu/submenu-trigger-item.tsx | 2 +-
 packages/components/src/menu/trigger-button.tsx       | 5 ++++-
 packages/components/src/tabs/index.tsx                | 4 ++--
 packages/components/src/tabs/tab.tsx                  | 5 ++++-
 packages/components/src/tabs/tablist.tsx              | 2 +-
 packages/components/src/tabs/tabpanel.tsx             | 2 +-
 22 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/packages/components/src/composite/group-label.tsx b/packages/components/src/composite/group-label.tsx
index 6f8783789d6f7d..354384ba4ade48 100644
--- a/packages/components/src/composite/group-label.tsx
+++ b/packages/components/src/composite/group-label.tsx
@@ -7,7 +7,7 @@ import type { CompositeGroupLabelProps } from './types';
 export const CompositeGroupLabel = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< CompositeGroupLabelProps, 'div', false >
->( function CompositeGroupLabel( props, ref ) {
+>( function UnforwardedCompositeGroupLabel( props, ref ) {
 	const context = useCompositeContext();
 	const isWithinGroup = useCompositeGroupContext();
 
diff --git a/packages/components/src/composite/group.tsx b/packages/components/src/composite/group.tsx
index 9d10a92208a0b2..c2adeba605a4b8 100644
--- a/packages/components/src/composite/group.tsx
+++ b/packages/components/src/composite/group.tsx
@@ -7,7 +7,7 @@ import type { CompositeGroupProps } from './types';
 export const CompositeGroup = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< CompositeGroupProps, 'div', false >
->( function CompositeGroup( props, ref ) {
+>( function UnforwardedCompositeGroup( props, ref ) {
 	const context = useCompositeContext();
 	const { children, ...restProps } = props;
 
diff --git a/packages/components/src/composite/hover.tsx b/packages/components/src/composite/hover.tsx
index 4f2f0f873dcc7c..3126433c4d340c 100644
--- a/packages/components/src/composite/hover.tsx
+++ b/packages/components/src/composite/hover.tsx
@@ -7,7 +7,7 @@ import type { CompositeHoverProps } from './types';
 export const CompositeHover = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< CompositeHoverProps, 'div', false >
->( function CompositeHover( props, ref ) {
+>( function UnforwardedCompositeHover( props, ref ) {
 	const context = useCompositeContext();
 
 	// @ts-expect-error The store prop is undocumented and only used by the
diff --git a/packages/components/src/composite/index.tsx b/packages/components/src/composite/index.tsx
index 91b7a90e19743c..de882bdaca0a4b 100644
--- a/packages/components/src/composite/index.tsx
+++ b/packages/components/src/composite/index.tsx
@@ -39,7 +39,7 @@ export const Composite = Object.assign(
 	forwardRef<
 		HTMLDivElement,
 		WordPressComponentProps< CompositeProps, 'div', false >
-	>( function Composite(
+	>( function UnforwardedComposite(
 		{
 			// Composite store props
 			activeId,
diff --git a/packages/components/src/composite/item.tsx b/packages/components/src/composite/item.tsx
index 728603c605e59a..166f78526133ba 100644
--- a/packages/components/src/composite/item.tsx
+++ b/packages/components/src/composite/item.tsx
@@ -8,7 +8,7 @@ import type { CompositeItemProps } from './types';
 export const CompositeItem = forwardRef<
 	HTMLButtonElement,
 	WordPressComponentProps< CompositeItemProps, 'button', false >
->( function CompositeItem( props, ref ) {
+>( function UnforwardedCompositeItem( props, ref ) {
 	const context = useCompositeContext();
 
 	// @ts-expect-error The store prop is undocumented and only used by the
diff --git a/packages/components/src/composite/row.tsx b/packages/components/src/composite/row.tsx
index affa120129163a..54007a8b3562e9 100644
--- a/packages/components/src/composite/row.tsx
+++ b/packages/components/src/composite/row.tsx
@@ -7,7 +7,7 @@ import type { CompositeRowProps } from './types';
 export const CompositeRow = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< CompositeRowProps, 'div', false >
->( function CompositeRow( props, ref ) {
+>( function UnforwardedCompositeRow( props, ref ) {
 	const context = useCompositeContext();
 
 	// @ts-expect-error The store prop is undocumented and only used by the
diff --git a/packages/components/src/composite/typeahead.tsx b/packages/components/src/composite/typeahead.tsx
index c4efeaf7bdadeb..b6ea467440e88d 100644
--- a/packages/components/src/composite/typeahead.tsx
+++ b/packages/components/src/composite/typeahead.tsx
@@ -7,7 +7,7 @@ import type { CompositeTypeaheadProps } from './types';
 export const CompositeTypeahead = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< CompositeTypeaheadProps, 'div', false >
->( function CompositeTypeahead( props, ref ) {
+>( function UnforwardedCompositeTypeahead( props, ref ) {
 	const context = useCompositeContext();
 
 	// @ts-expect-error The store prop is undocumented and only used by the
diff --git a/packages/components/src/menu/checkbox-item.tsx b/packages/components/src/menu/checkbox-item.tsx
index 485ab8064102cd..7eb43e832d3d60 100644
--- a/packages/components/src/menu/checkbox-item.tsx
+++ b/packages/components/src/menu/checkbox-item.tsx
@@ -10,7 +10,7 @@ import { useMenuItemHideOnClick } from './use-menu-item-hide-on-click';
 export const CheckboxItem = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< CheckboxItemProps, 'div', false >
->( function CheckboxItem(
+>( function UnforwardedCheckboxItem(
 	{ suffix, children, disabled = false, hideOnClick = false, ...props },
 	ref
 ) {
diff --git a/packages/components/src/menu/group.tsx b/packages/components/src/menu/group.tsx
index 61617dbe0d47a4..5d9e91e213ec03 100644
--- a/packages/components/src/menu/group.tsx
+++ b/packages/components/src/menu/group.tsx
@@ -7,7 +7,7 @@ import * as Styled from './styles';
 export const Group = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< GroupProps, 'div', false >
->( function Group( props, ref ) {
+>( function UnforwardedGroup( props, ref ) {
 	const menuContext = useContext( Context );
 
 	if ( ! menuContext?.store ) {
diff --git a/packages/components/src/menu/item-help-text.tsx b/packages/components/src/menu/item-help-text.tsx
index 8c7ad6e180bd0f..1cb596c0704d8c 100644
--- a/packages/components/src/menu/item-help-text.tsx
+++ b/packages/components/src/menu/item-help-text.tsx
@@ -6,7 +6,7 @@ import * as Styled from './styles';
 export const ItemHelpText = forwardRef<
 	HTMLSpanElement,
 	WordPressComponentProps< { children: React.ReactNode }, 'span', true >
->( function ItemHelpText( props, ref ) {
+>( function UnforwardedItemHelpText( props, ref ) {
 	const menuContext = useContext( Context );
 
 	if ( ! menuContext?.store ) {
diff --git a/packages/components/src/menu/item-label.tsx b/packages/components/src/menu/item-label.tsx
index f74e652c7f776c..ab01bac3a68921 100644
--- a/packages/components/src/menu/item-label.tsx
+++ b/packages/components/src/menu/item-label.tsx
@@ -6,7 +6,7 @@ import * as Styled from './styles';
 export const ItemLabel = forwardRef<
 	HTMLSpanElement,
 	WordPressComponentProps< { children: React.ReactNode }, 'span', true >
->( function ItemLabel( props, ref ) {
+>( function UnforwardedItemLabel( props, ref ) {
 	const menuContext = useContext( Context );
 
 	if ( ! menuContext?.store ) {
diff --git a/packages/components/src/menu/item.tsx b/packages/components/src/menu/item.tsx
index 70f69df6a497af..9dd3ce2f5295a8 100644
--- a/packages/components/src/menu/item.tsx
+++ b/packages/components/src/menu/item.tsx
@@ -8,7 +8,7 @@ import { useMenuItemHideOnClick } from './use-menu-item-hide-on-click';
 export const Item = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< ItemProps, 'div', false >
->( function Item(
+>( function UnforwardedItem(
 	{
 		prefix,
 		suffix,
diff --git a/packages/components/src/menu/popover.tsx b/packages/components/src/menu/popover.tsx
index 977257ee67dcd8..ca14b62c1a2237 100644
--- a/packages/components/src/menu/popover.tsx
+++ b/packages/components/src/menu/popover.tsx
@@ -13,7 +13,10 @@ import { Context } from './context';
 export const Popover = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< PopoverProps, 'div', false >
->( function Popover( { gutter, shift, modal = true, ...otherProps }, ref ) {
+>( function UnforwardedPopover(
+	{ gutter, shift, modal = true, ...otherProps },
+	ref
+) {
 	const menuContext = useContext( Context );
 
 	// Extract the side from the applied placement — useful for animations.
diff --git a/packages/components/src/menu/radio-item.tsx b/packages/components/src/menu/radio-item.tsx
index 2de8164db8158d..e4644707737cd7 100644
--- a/packages/components/src/menu/radio-item.tsx
+++ b/packages/components/src/menu/radio-item.tsx
@@ -17,7 +17,7 @@ const radioCheck = (
 export const RadioItem = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< RadioItemProps, 'div', false >
->( function RadioItem(
+>( function UnforwardedRadioItem(
 	{ suffix, children, disabled = false, hideOnClick = false, ...props },
 	ref
 ) {
diff --git a/packages/components/src/menu/separator.tsx b/packages/components/src/menu/separator.tsx
index dcde37083cb0c9..f5e3fd1b08f95f 100644
--- a/packages/components/src/menu/separator.tsx
+++ b/packages/components/src/menu/separator.tsx
@@ -7,7 +7,7 @@ import * as Styled from './styles';
 export const Separator = forwardRef<
 	HTMLHRElement,
 	WordPressComponentProps< SeparatorProps, 'hr', false >
->( function Separator( props, ref ) {
+>( function UnforwardedSeparator( props, ref ) {
 	const menuContext = useContext( Context );
 
 	if ( ! menuContext?.store ) {
diff --git a/packages/components/src/menu/stories/index.story.tsx b/packages/components/src/menu/stories/index.story.tsx
index 522b8043a72ec5..01dd67e59d2046 100644
--- a/packages/components/src/menu/stories/index.story.tsx
+++ b/packages/components/src/menu/stories/index.story.tsx
@@ -167,7 +167,7 @@ export const WithSubmenu: StoryObj< typeof Menu > = {
 };
 
 export const WithCheckboxes: StoryObj< typeof Menu > = {
-	render: function WithCheckboxes( props: Props ) {
+	render: function WithCheckboxesRender( props: Props ) {
 		const [ isAChecked, setAChecked ] = useState( false );
 		const [ isBChecked, setBChecked ] = useState( true );
 		const [ multipleCheckboxesValue, setMultipleCheckboxesValue ] =
@@ -317,7 +317,7 @@ export const WithCheckboxes: StoryObj< typeof Menu > = {
 };
 
 export const WithRadios: StoryObj< typeof Menu > = {
-	render: function WithRadios( props: Props ) {
+	render: function WithRadiosRender( props: Props ) {
 		const [ radioValue, setRadioValue ] = useState( 'two' );
 		const onRadioChange: React.ComponentProps<
 			typeof Menu.RadioItem
@@ -389,7 +389,7 @@ export const WithRadios: StoryObj< typeof Menu > = {
 };
 
 export const WithModal: StoryObj< typeof Menu > = {
-	render: function WithModal( props: Props ) {
+	render: function WithModalRender( props: Props ) {
 		const [ isModalOpen, setModalOpen ] = useState( false );
 
 		return (
@@ -566,7 +566,7 @@ export const ToolbarVariant: StoryObj< typeof Menu > = {
 };
 
 export const InsideModal: StoryObj< typeof Menu > = {
-	render: function InsideModal( props: Props ) {
+	render: function InsideModalRender( props: Props ) {
 		const [ isModalOpen, setModalOpen ] = useState( false );
 		return (
 			<>
diff --git a/packages/components/src/menu/submenu-trigger-item.tsx b/packages/components/src/menu/submenu-trigger-item.tsx
index 96ba7ceca51faf..f49eb6a76dc6e4 100644
--- a/packages/components/src/menu/submenu-trigger-item.tsx
+++ b/packages/components/src/menu/submenu-trigger-item.tsx
@@ -10,7 +10,7 @@ import * as Styled from './styles';
 export const SubmenuTriggerItem = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< ItemProps, 'div', false >
->( function SubmenuTriggerItem( { suffix, ...otherProps }, ref ) {
+>( function UnforwardedSubmenuTriggerItem( { suffix, ...otherProps }, ref ) {
 	const menuContext = useContext( Context );
 
 	if ( ! menuContext?.store.parent ) {
diff --git a/packages/components/src/menu/trigger-button.tsx b/packages/components/src/menu/trigger-button.tsx
index ff7d33339c3539..a97efbfbfd1918 100644
--- a/packages/components/src/menu/trigger-button.tsx
+++ b/packages/components/src/menu/trigger-button.tsx
@@ -7,7 +7,10 @@ import { Context } from './context';
 export const TriggerButton = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< TriggerButtonProps, 'button', false >
->( function TriggerButton( { children, disabled = false, ...props }, ref ) {
+>( function UnforwardedTriggerButton(
+	{ children, disabled = false, ...props },
+	ref
+) {
 	const menuContext = useContext( Context );
 
 	if ( ! menuContext?.store ) {
diff --git a/packages/components/src/tabs/index.tsx b/packages/components/src/tabs/index.tsx
index 7656c6771fd7d5..ce7d6973e93873 100644
--- a/packages/components/src/tabs/index.tsx
+++ b/packages/components/src/tabs/index.tsx
@@ -35,7 +35,7 @@ function internalToExternalTabId(
  * It is responsible for managing the state of the tabs, and rendering one instance of the `Tabs.TabList` component and one or more instances of the `Tab.TabPanel` component.
  */
 export const Tabs = Object.assign(
-	function Tabs( {
+	function TabsRoot( {
 		selectOnMove = true,
 		defaultTabId,
 		orientation = 'horizontal',
@@ -46,7 +46,7 @@ export const Tabs = Object.assign(
 		defaultActiveTabId,
 		onActiveTabIdChange,
 	}: TabsProps ) {
-		const instanceId = useInstanceId( Tabs, 'tabs' );
+		const instanceId = useInstanceId( TabsRoot, 'tabs' );
 		const store = Ariakit.useTabStore( {
 			selectOnMove,
 			orientation,
diff --git a/packages/components/src/tabs/tab.tsx b/packages/components/src/tabs/tab.tsx
index 57d08b9b61af52..72f3d544f1eab5 100644
--- a/packages/components/src/tabs/tab.tsx
+++ b/packages/components/src/tabs/tab.tsx
@@ -13,7 +13,10 @@ import type { WordPressComponentProps } from '../context';
 export const Tab = forwardRef<
 	HTMLButtonElement,
 	Omit< WordPressComponentProps< TabProps, 'button', false >, 'id' >
->( function Tab( { children, tabId, disabled, render, ...otherProps }, ref ) {
+>( function UnforwardedTab(
+	{ children, tabId, disabled, render, ...otherProps },
+	ref
+) {
 	const { store, instanceId } = useTabsContext() ?? {};
 
 	if ( ! store ) {
diff --git a/packages/components/src/tabs/tablist.tsx b/packages/components/src/tabs/tablist.tsx
index 128c834d2319fa..0cde2d47e23d80 100644
--- a/packages/components/src/tabs/tablist.tsx
+++ b/packages/components/src/tabs/tablist.tsx
@@ -59,7 +59,7 @@ function useScrollRectIntoView(
 export const TabList = forwardRef<
 	HTMLDivElement,
 	WordPressComponentProps< TabListProps, 'div', false >
->( function TabList( { children, ...otherProps }, ref ) {
+>( function UnforwardedTabList( { children, ...otherProps }, ref ) {
 	const { store } = useTabsContext() ?? {};
 
 	const selectedId = useStoreState( store, 'selectedId' );
diff --git a/packages/components/src/tabs/tabpanel.tsx b/packages/components/src/tabs/tabpanel.tsx
index 01f749482684c9..4e15713da10bd0 100644
--- a/packages/components/src/tabs/tabpanel.tsx
+++ b/packages/components/src/tabs/tabpanel.tsx
@@ -9,7 +9,7 @@ import type { WordPressComponentProps } from '../context';
 export const TabPanel = forwardRef<
 	HTMLDivElement,
 	Omit< WordPressComponentProps< TabPanelProps, 'div', false >, 'id' >
->( function TabPanel(
+>( function UnforwardedTabPanel(
 	{ children, tabId, focusable = true, ...otherProps },
 	ref
 ) {

From 473b7b5904a1d5de6354e7c03048e011fb93c09d Mon Sep 17 00:00:00 2001
From: Manzoor Wani <manzoorwani.jk@gmail.com>
Date: Tue, 29 Sep 2026 11:50:37 +0530
Subject: [PATCH 2/4] UI: Rename inner functions that shadow their component

---
 .../src/alert-dialog/stories/index.story.tsx  |   4 +-
 packages/ui/src/badge/badge.tsx               |  33 +++---
 .../breadcrumb/overflow-trigger-button.tsx    |   5 +-
 packages/ui/src/breadcrumb/separator.tsx      |   2 +-
 .../ui/src/breadcrumb/stories/index.story.tsx |   2 +-
 packages/ui/src/button/button.tsx             |   2 +-
 packages/ui/src/button/icon.tsx               |   2 +-
 packages/ui/src/calendar/calendar.tsx         |   2 +-
 packages/ui/src/calendar/range-calendar.tsx   |   2 +-
 .../src/collapsible/stories/index.story.tsx   |   4 +-
 .../checkbox-control/checkbox-control.tsx     |   2 +-
 .../src/form/input-control/input-control.tsx  |   2 +-
 .../form/primitives/autocomplete/clear.tsx    |   5 +-
 .../form/primitives/autocomplete/empty.tsx    |   2 +-
 .../primitives/autocomplete/group-label.tsx   |   5 +-
 .../form/primitives/autocomplete/group.tsx    |   2 +-
 .../primitives/autocomplete/input-group.tsx   |   2 +-
 .../form/primitives/autocomplete/input.tsx    |   5 +-
 .../src/form/primitives/autocomplete/item.tsx |   2 +-
 .../primitives/autocomplete/list-body.tsx     |   2 +-
 .../src/form/primitives/autocomplete/list.tsx |   2 +-
 .../form/primitives/autocomplete/popup.tsx    |   2 +-
 .../src/form/primitives/autocomplete/row.tsx  |   2 +-
 .../form/primitives/autocomplete/status.tsx   |   2 +-
 .../checkbox-group/checkbox-group.tsx         |   5 +-
 .../checkbox-group/nested-items.tsx           |   5 +-
 .../src/form/primitives/checkbox/checkbox.tsx |   5 +-
 .../primitives/combobox/chip-with-remove.tsx  |   2 +-
 .../ui/src/form/primitives/combobox/chips.tsx |   2 +-
 .../ui/src/form/primitives/combobox/clear.tsx |   5 +-
 .../ui/src/form/primitives/combobox/empty.tsx |   2 +-
 .../form/primitives/combobox/group-label.tsx  |   5 +-
 .../ui/src/form/primitives/combobox/group.tsx |   2 +-
 .../form/primitives/combobox/input-group.tsx  |   2 +-
 .../ui/src/form/primitives/combobox/input.tsx |   5 +-
 .../ui/src/form/primitives/combobox/item.tsx  |   2 +-
 .../form/primitives/combobox/list-body.tsx    |   2 +-
 .../form/primitives/combobox/list-footer.tsx  |   2 +-
 .../ui/src/form/primitives/combobox/list.tsx  |   2 +-
 .../ui/src/form/primitives/combobox/popup.tsx |   2 +-
 .../src/form/primitives/combobox/status.tsx   |   2 +-
 .../src/form/primitives/combobox/trigger.tsx  |   2 +-
 .../control-with-error/control-with-error.tsx |   2 +-
 .../test/control-with-error.browser.test.tsx  |   5 +-
 .../test/fixtures/validated-input-control.tsx |   4 +-
 .../ui/src/form/primitives/field/control.tsx  |   2 +-
 .../src/form/primitives/field/description.tsx |   2 +-
 .../ui/src/form/primitives/field/details.tsx  |   2 +-
 .../ui/src/form/primitives/field/item.tsx     |   2 +-
 .../ui/src/form/primitives/field/label.tsx    |   2 +-
 .../ui/src/form/primitives/field/root.tsx     |  28 ++---
 .../form/primitives/field/visual-label.tsx    |   5 +-
 .../form/primitives/fieldset/description.tsx  |   2 +-
 .../src/form/primitives/fieldset/details.tsx  |   5 +-
 .../src/form/primitives/fieldset/legend.tsx   |   2 +-
 .../ui/src/form/primitives/fieldset/root.tsx  |   5 +-
 .../primitives/input-layout/input-layout.tsx  |   2 +-
 .../src/form/primitives/input-layout/slot.tsx |   2 +-
 .../ui/src/form/primitives/input/input.tsx    |  50 ++++-----
 .../primitives/radio-group/radio-group.tsx    |   5 +-
 .../ui/src/form/primitives/radio/radio.tsx    |  37 ++++---
 .../searchable-chip-select.tsx                |   2 +-
 .../primitives/searchable-select/item.tsx     |   2 +-
 .../searchable-select/searchable-select.tsx   |   2 +-
 .../form/primitives/select/group-label.tsx    |   5 +-
 .../ui/src/form/primitives/select/group.tsx   |   2 +-
 .../primitives/select/item-description.tsx    |   2 +-
 .../src/form/primitives/select/item-label.tsx |   5 +-
 .../ui/src/form/primitives/select/item.tsx    |   2 +-
 .../ui/src/form/primitives/select/popup.tsx   |   2 +-
 .../ui/src/form/primitives/select/trigger.tsx |   2 +-
 .../ui/src/form/primitives/switch/switch.tsx  |   2 +-
 .../src/form/primitives/textarea/textarea.tsx |   2 +-
 .../radio-group-control.tsx                   |   2 +-
 .../searchable-chip-select-control.tsx        |   2 +-
 .../searchable-select-control.tsx             |   2 +-
 packages/ui/src/form/select-control/item.tsx  |   2 +-
 .../form/select-control/select-control.tsx    |   2 +-
 .../form/switch-control/switch-control.tsx    |   2 +-
 .../textarea-control/textarea-control.tsx     |   2 +-
 .../validated-input-control.tsx               |   2 +-
 .../validated-textarea-control.tsx            |   2 +-
 packages/ui/src/icon-button/icon-button.tsx   |   2 +-
 packages/ui/src/icon/icon.tsx                 |  37 ++++---
 packages/ui/src/link-button/icon.tsx          |   2 +-
 packages/ui/src/link-button/link-button.tsx   |   2 +-
 packages/ui/src/link/link.tsx                 | 100 +++++++++---------
 packages/ui/src/popover/stories/utils.tsx     |   2 +-
 packages/ui/src/skeleton/skeleton.tsx         |   2 +-
 packages/ui/src/spinner/spinner.tsx           |   2 +-
 packages/ui/src/stack/stack.tsx               |  41 +++----
 packages/ui/src/tabs/stories/index.story.tsx  |   2 +-
 packages/ui/src/tabs/tab.tsx                  |  37 ++++---
 packages/ui/src/text/text.tsx                 |  42 ++++----
 packages/ui/src/utils/keyboard-shortcut.tsx   |   7 +-
 .../src/visually-hidden/visually-hidden.tsx   |   2 +-
 96 files changed, 355 insertions(+), 286 deletions(-)

diff --git a/packages/ui/src/alert-dialog/stories/index.story.tsx b/packages/ui/src/alert-dialog/stories/index.story.tsx
index 0cfc49a72f044e..eb355cf19e9c19 100644
--- a/packages/ui/src/alert-dialog/stories/index.story.tsx
+++ b/packages/ui/src/alert-dialog/stories/index.story.tsx
@@ -217,7 +217,7 @@ function sleep( ms: number ) {
  * reopens.
  */
 export const AsyncConfirm: Story = {
-	render: function AsyncConfirm( args ) {
+	render: function AsyncConfirmRender( args ) {
 		const [ shouldFail, setShouldFail ] = useState( false );
 		const successId = useId();
 		const failureId = useId();
@@ -374,7 +374,7 @@ export const Scrollable: Story = {
  * from code or from a non-standard trigger element.
  */
 export const Controlled: Story = {
-	render: function Controlled( args ) {
+	render: function ControlledRender( args ) {
 		const [ isOpen, setIsOpen ] = useState( false );
 
 		return (
diff --git a/packages/ui/src/badge/badge.tsx b/packages/ui/src/badge/badge.tsx
index bda48c427901b3..44c498e337e822 100644
--- a/packages/ui/src/badge/badge.tsx
+++ b/packages/ui/src/badge/badge.tsx
@@ -7,20 +7,19 @@ import { Text } from '../text';
 /**
  * A badge component for displaying labels with semantic intent.
  */
-export const Badge = forwardRef< HTMLSpanElement, BadgeProps >( function Badge(
-	{ intent = 'none', className, ...props },
-	ref
-) {
-	return (
-		<Text
-			ref={ ref }
-			className={ clsx(
-				styles.badge,
-				styles[ `is-${ intent }-intent` ],
-				className
-			) }
-			{ ...props }
-			variant="body-sm"
-		/>
-	);
-} );
+export const Badge = forwardRef< HTMLSpanElement, BadgeProps >(
+	function UnforwardedBadge( { intent = 'none', className, ...props }, ref ) {
+		return (
+			<Text
+				ref={ ref }
+				className={ clsx(
+					styles.badge,
+					styles[ `is-${ intent }-intent` ],
+					className
+				) }
+				{ ...props }
+				variant="body-sm"
+			/>
+		);
+	}
+);
diff --git a/packages/ui/src/breadcrumb/overflow-trigger-button.tsx b/packages/ui/src/breadcrumb/overflow-trigger-button.tsx
index 37bf1005f5effa..523a6f8f4c3038 100644
--- a/packages/ui/src/breadcrumb/overflow-trigger-button.tsx
+++ b/packages/ui/src/breadcrumb/overflow-trigger-button.tsx
@@ -5,7 +5,10 @@ import type { ButtonProps } from '../button/types';
 import styles from './style.module.css';
 
 const OverflowTriggerButton = forwardRef< HTMLButtonElement, ButtonProps >(
-	function OverflowTriggerButton( { children, className, ...props }, ref ) {
+	function UnforwardedOverflowTriggerButton(
+		{ children, className, ...props },
+		ref
+	) {
 		return (
 			<Button
 				{ ...props }
diff --git a/packages/ui/src/breadcrumb/separator.tsx b/packages/ui/src/breadcrumb/separator.tsx
index cfbd34207ca12d..964bf1e26fd228 100644
--- a/packages/ui/src/breadcrumb/separator.tsx
+++ b/packages/ui/src/breadcrumb/separator.tsx
@@ -2,7 +2,7 @@ import { forwardRef } from '@wordpress/element';
 import styles from './style.module.css';
 
 const Separator = forwardRef< HTMLSpanElement, Record< never, never > >(
-	function Separator( _props, ref ) {
+	function UnforwardedSeparator( _props, ref ) {
 		return (
 			<span ref={ ref } aria-hidden="true" className={ styles.separator }>
 				/
diff --git a/packages/ui/src/breadcrumb/stories/index.story.tsx b/packages/ui/src/breadcrumb/stories/index.story.tsx
index 724df542f27951..80246d1dbf44f4 100644
--- a/packages/ui/src/breadcrumb/stories/index.story.tsx
+++ b/packages/ui/src/breadcrumb/stories/index.story.tsx
@@ -141,7 +141,7 @@ export const LongLabelsAndRtl: Story = {
 };
 
 const RouterLink = forwardRef< HTMLAnchorElement, ComponentProps< 'a' > >(
-	function RouterLink( { children, ...props }, ref ) {
+	function UnforwardedRouterLink( { children, ...props }, ref ) {
 		return (
 			<a { ...props } ref={ ref } data-router-link>
 				{ children }
diff --git a/packages/ui/src/button/button.tsx b/packages/ui/src/button/button.tsx
index 6136988b78c68b..97041efb6d92ec 100644
--- a/packages/ui/src/button/button.tsx
+++ b/packages/ui/src/button/button.tsx
@@ -16,7 +16,7 @@ import defenseStyles from '../utils/css/global-css-defense.module.css';
  * for when to use `Button`, `IconButton`, `Link`, or `LinkButton`.
  */
 export const Button = forwardRef< HTMLButtonElement, ButtonProps >(
-	function Button(
+	function UnforwardedButton(
 		{
 			tone = 'brand',
 			variant = 'solid',
diff --git a/packages/ui/src/button/icon.tsx b/packages/ui/src/button/icon.tsx
index 9a491d85299932..c70ea8e4ece7c7 100644
--- a/packages/ui/src/button/icon.tsx
+++ b/packages/ui/src/button/icon.tsx
@@ -5,7 +5,7 @@ import { Icon } from '../icon';
 import styles from './style.module.css';
 
 export const ButtonIcon = forwardRef< SVGSVGElement, ButtonIconProps >(
-	function ButtonIcon( { className, icon, ...props }, ref ) {
+	function UnforwardedButtonIcon( { className, icon, ...props }, ref ) {
 		return (
 			<Icon
 				ref={ ref }
diff --git a/packages/ui/src/calendar/calendar.tsx b/packages/ui/src/calendar/calendar.tsx
index 46c61c08853d0e..5d5480cb094e7a 100644
--- a/packages/ui/src/calendar/calendar.tsx
+++ b/packages/ui/src/calendar/calendar.tsx
@@ -17,7 +17,7 @@ import type { CalendarProps, OnValueChangeHandler } from './types';
  * support, and customizable labels for internationalization.
  */
 export const Calendar = forwardRef< HTMLDivElement, CalendarProps >(
-	function Calendar(
+	function UnforwardedCalendar(
 		{
 			defaultValue,
 			value: valueProp,
diff --git a/packages/ui/src/calendar/range-calendar.tsx b/packages/ui/src/calendar/range-calendar.tsx
index 7f98a934be623a..81754b174f85ec 100644
--- a/packages/ui/src/calendar/range-calendar.tsx
+++ b/packages/ui/src/calendar/range-calendar.tsx
@@ -144,7 +144,7 @@ export function usePreviewRange( {
  * support, and customizable labels for internationalization.
  */
 export const RangeCalendar = forwardRef< HTMLDivElement, RangeCalendarProps >(
-	function RangeCalendar(
+	function UnforwardedRangeCalendar(
 		{
 			defaultValue,
 			value: valueProp,
diff --git a/packages/ui/src/collapsible/stories/index.story.tsx b/packages/ui/src/collapsible/stories/index.story.tsx
index 6751c05656a760..1797764a5cfb26 100644
--- a/packages/ui/src/collapsible/stories/index.story.tsx
+++ b/packages/ui/src/collapsible/stories/index.story.tsx
@@ -68,7 +68,7 @@ export const Disabled: Story = {
  * match — improving discoverability without sacrificing the collapsed layout.
  */
 export const HiddenUntilFound: Story = {
-	render: function HiddenUntilFound() {
+	render: function HiddenUntilFoundRender() {
 		return (
 			<div>
 				<p>
@@ -96,7 +96,7 @@ export const Controlled: Story = {
 		open: { control: false },
 		defaultOpen: { control: false },
 	},
-	render: function Controlled() {
+	render: function ControlledRender() {
 		const [ open, setOpen ] = useState( false );
 		return (
 			<Collapsible.Root open={ open } onOpenChange={ setOpen }>
diff --git a/packages/ui/src/form/checkbox-control/checkbox-control.tsx b/packages/ui/src/form/checkbox-control/checkbox-control.tsx
index 200866a2f78bac..d42ba838453f0b 100644
--- a/packages/ui/src/form/checkbox-control/checkbox-control.tsx
+++ b/packages/ui/src/form/checkbox-control/checkbox-control.tsx
@@ -28,7 +28,7 @@ const TextContainer = ( {
 export const CheckboxControl = forwardRef<
 	HTMLSpanElement,
 	CheckboxControlProps
->( function CheckboxControl(
+>( function UnforwardedCheckboxControl(
 	{
 		label,
 		description,
diff --git a/packages/ui/src/form/input-control/input-control.tsx b/packages/ui/src/form/input-control/input-control.tsx
index 7d4246fb6c9427..6c9ac028252830 100644
--- a/packages/ui/src/form/input-control/input-control.tsx
+++ b/packages/ui/src/form/input-control/input-control.tsx
@@ -8,7 +8,7 @@ import type { InputControlProps } from './types';
  * A complete input field with integrated label and description.
  */
 export const InputControl = forwardRef< HTMLInputElement, InputControlProps >(
-	function InputControl(
+	function UnforwardedInputControl(
 		{
 			className,
 			label,
diff --git a/packages/ui/src/form/primitives/autocomplete/clear.tsx b/packages/ui/src/form/primitives/autocomplete/clear.tsx
index 9442bb5e2daab4..9b5c91a94b683b 100644
--- a/packages/ui/src/form/primitives/autocomplete/clear.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/clear.tsx
@@ -29,7 +29,10 @@ const DEFAULT_RENDER = (
  * A button that clears the input value.
  */
 export const Clear = forwardRef< HTMLButtonElement, AutocompleteClearProps >(
-	function Clear( { render = DEFAULT_RENDER, ...restProps }, ref ) {
+	function UnforwardedClear(
+		{ render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
 		return (
 			<_Autocomplete.Clear
 				ref={ ref }
diff --git a/packages/ui/src/form/primitives/autocomplete/empty.tsx b/packages/ui/src/form/primitives/autocomplete/empty.tsx
index 24c86d36393362..e9fce91fa68462 100644
--- a/packages/ui/src/form/primitives/autocomplete/empty.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/empty.tsx
@@ -5,7 +5,7 @@ import type { AutocompleteEmptyProps } from './types';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 
 export const Empty = forwardRef< HTMLDivElement, AutocompleteEmptyProps >(
-	function Empty( { className, ...restProps }, ref ) {
+	function UnforwardedEmpty( { className, ...restProps }, ref ) {
 		return (
 			<_Autocomplete.Empty
 				className={ clsx( itemPopupStyles.empty, className ) }
diff --git a/packages/ui/src/form/primitives/autocomplete/group-label.tsx b/packages/ui/src/form/primitives/autocomplete/group-label.tsx
index 10c5d560d76721..c0a50d06b66367 100644
--- a/packages/ui/src/form/primitives/autocomplete/group-label.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/group-label.tsx
@@ -12,7 +12,10 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 export const GroupLabel = forwardRef<
 	HTMLDivElement,
 	AutocompleteGroupLabelProps
->( function GroupLabel( { className, children, ...restProps }, ref ) {
+>( function UnforwardedGroupLabel(
+	{ className, children, ...restProps },
+	ref
+) {
 	return (
 		<Text
 			variant="heading-sm"
diff --git a/packages/ui/src/form/primitives/autocomplete/group.tsx b/packages/ui/src/form/primitives/autocomplete/group.tsx
index ee354eb1548915..71b4c4c00848a8 100644
--- a/packages/ui/src/form/primitives/autocomplete/group.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/group.tsx
@@ -10,7 +10,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * `Autocomplete.Collection` components iterate over them.
  */
 export const Group = forwardRef< HTMLDivElement, AutocompleteGroupProps >(
-	function Group( { className, children, ...restProps }, ref ) {
+	function UnforwardedGroup( { className, children, ...restProps }, ref ) {
 		return (
 			<_Autocomplete.Group
 				className={ clsx( itemPopupStyles.group, className ) }
diff --git a/packages/ui/src/form/primitives/autocomplete/input-group.tsx b/packages/ui/src/form/primitives/autocomplete/input-group.tsx
index 3751190fd41211..a696911cb3fd77 100644
--- a/packages/ui/src/form/primitives/autocomplete/input-group.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/input-group.tsx
@@ -11,6 +11,6 @@ import type { AutocompleteInputGroupProps } from './types';
 export const InputGroup = forwardRef<
 	HTMLDivElement,
 	AutocompleteInputGroupProps
->( function InputGroup( props, ref ) {
+>( function UnforwardedInputGroup( props, ref ) {
 	return <_Autocomplete.InputGroup ref={ ref } { ...props } />;
 } );
diff --git a/packages/ui/src/form/primitives/autocomplete/input.tsx b/packages/ui/src/form/primitives/autocomplete/input.tsx
index 195cba1b6b47ea..2a35785903327f 100644
--- a/packages/ui/src/form/primitives/autocomplete/input.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/input.tsx
@@ -8,7 +8,10 @@ const DEFAULT_RENDER = ( props: AutocompleteInputProps ) => (
 );
 
 export const Input = forwardRef< HTMLInputElement, AutocompleteInputProps >(
-	function Input( { render = DEFAULT_RENDER, ...restProps }, ref ) {
+	function UnforwardedInput(
+		{ render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
 		return (
 			<_Autocomplete.Input
 				ref={ ref }
diff --git a/packages/ui/src/form/primitives/autocomplete/item.tsx b/packages/ui/src/form/primitives/autocomplete/item.tsx
index 6aabe2bbc4445f..b5c6925201acee 100644
--- a/packages/ui/src/form/primitives/autocomplete/item.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/item.tsx
@@ -7,7 +7,7 @@ import resetStyles from '../../../utils/css/resets.module.css';
 import type { AutocompleteItemProps } from './types';
 
 export const Item = forwardRef< HTMLDivElement, AutocompleteItemProps >(
-	function Item( { className, children, ...restProps }, ref ) {
+	function UnforwardedItem( { className, children, ...restProps }, ref ) {
 		return (
 			<_Autocomplete.Item
 				className={ clsx(
diff --git a/packages/ui/src/form/primitives/autocomplete/list-body.tsx b/packages/ui/src/form/primitives/autocomplete/list-body.tsx
index 7ca574ed86d306..2bca0b277901c6 100644
--- a/packages/ui/src/form/primitives/autocomplete/list-body.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/list-body.tsx
@@ -7,7 +7,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * A layout container for the main scrolling area in the `List`, for holding `Item`s.
  */
 export const ListBody = forwardRef< HTMLDivElement, AutocompleteListBodyProps >(
-	function ListBody( { render, ...props }, ref ) {
+	function UnforwardedListBody( { render, ...props }, ref ) {
 		const element = useRender( {
 			defaultTagName: 'div',
 			render,
diff --git a/packages/ui/src/form/primitives/autocomplete/list.tsx b/packages/ui/src/form/primitives/autocomplete/list.tsx
index 63ca67200732f9..5d1a7e92979fce 100644
--- a/packages/ui/src/form/primitives/autocomplete/list.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/list.tsx
@@ -5,7 +5,7 @@ import type { AutocompleteListProps } from './types';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 
 export const List = forwardRef< HTMLDivElement, AutocompleteListProps >(
-	function List( { className, ...restProps }, ref ) {
+	function UnforwardedList( { className, ...restProps }, ref ) {
 		return (
 			<_Autocomplete.List
 				className={ clsx( itemPopupStyles.list, className ) }
diff --git a/packages/ui/src/form/primitives/autocomplete/popup.tsx b/packages/ui/src/form/primitives/autocomplete/popup.tsx
index 28bcb49b626267..1a771969fb0f81 100644
--- a/packages/ui/src/form/primitives/autocomplete/popup.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/popup.tsx
@@ -9,7 +9,7 @@ import { Positioner } from './positioner';
 import type { AutocompletePopupProps } from './types';
 
 export const Popup = forwardRef< HTMLDivElement, AutocompletePopupProps >(
-	function Popup(
+	function UnforwardedPopup(
 		{ className, portal, positioner, width, ...restProps },
 		ref
 	) {
diff --git a/packages/ui/src/form/primitives/autocomplete/row.tsx b/packages/ui/src/form/primitives/autocomplete/row.tsx
index 209dbb75637ff1..8c1bd7ddb92837 100644
--- a/packages/ui/src/form/primitives/autocomplete/row.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/row.tsx
@@ -9,7 +9,7 @@ import { useAutocompleteGridContext } from './context';
  * grid and use two-dimensional keyboard navigation.
  */
 export const Row = forwardRef< HTMLDivElement, AutocompleteRowProps >(
-	function Row( { children, ...restProps }, ref ) {
+	function UnforwardedRow( { children, ...restProps }, ref ) {
 		const isGrid = useAutocompleteGridContext();
 		if ( process.env.NODE_ENV !== 'production' && ! isGrid ) {
 			throw new Error(
diff --git a/packages/ui/src/form/primitives/autocomplete/status.tsx b/packages/ui/src/form/primitives/autocomplete/status.tsx
index 1b0b601a1e08bf..d3da1f4ec40c7a 100644
--- a/packages/ui/src/form/primitives/autocomplete/status.tsx
+++ b/packages/ui/src/form/primitives/autocomplete/status.tsx
@@ -13,7 +13,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * instead.
  */
 export const Status = forwardRef< HTMLDivElement, AutocompleteStatusProps >(
-	function Status( { className, ...restProps }, ref ) {
+	function UnforwardedStatus( { className, ...restProps }, ref ) {
 		return (
 			<_Autocomplete.Status
 				className={ clsx( itemPopupStyles.status, className ) }
diff --git a/packages/ui/src/form/primitives/checkbox-group/checkbox-group.tsx b/packages/ui/src/form/primitives/checkbox-group/checkbox-group.tsx
index ba98dee6da8ea1..f0b2e1bc9ebd06 100644
--- a/packages/ui/src/form/primitives/checkbox-group/checkbox-group.tsx
+++ b/packages/ui/src/form/primitives/checkbox-group/checkbox-group.tsx
@@ -17,7 +17,10 @@ const DEFAULT_RENDER = ( props: React.ComponentProps< typeof Stack > ) => (
  * accessible name.
  */
 export const CheckboxGroup = forwardRef< HTMLDivElement, CheckboxGroupProps >(
-	function CheckboxGroup( { render = DEFAULT_RENDER, ...restProps }, ref ) {
+	function UnforwardedCheckboxGroup(
+		{ render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
 		return (
 			<_CheckboxGroup ref={ ref } render={ render } { ...restProps } />
 		);
diff --git a/packages/ui/src/form/primitives/checkbox-group/nested-items.tsx b/packages/ui/src/form/primitives/checkbox-group/nested-items.tsx
index 005ed9c6e83538..a1873a83964cad 100644
--- a/packages/ui/src/form/primitives/checkbox-group/nested-items.tsx
+++ b/packages/ui/src/form/primitives/checkbox-group/nested-items.tsx
@@ -10,7 +10,10 @@ import type { CheckboxGroupNestedItemsProps } from './types';
 export const CheckboxGroupNestedItems = forwardRef<
 	HTMLDivElement,
 	CheckboxGroupNestedItemsProps
->( function CheckboxGroupNestedItems( { className, ...restProps }, ref ) {
+>( function UnforwardedCheckboxGroupNestedItems(
+	{ className, ...restProps },
+	ref
+) {
 	return (
 		<Stack
 			ref={ ref }
diff --git a/packages/ui/src/form/primitives/checkbox/checkbox.tsx b/packages/ui/src/form/primitives/checkbox/checkbox.tsx
index 5a31e94eb021d9..2cfda2ff510353 100644
--- a/packages/ui/src/form/primitives/checkbox/checkbox.tsx
+++ b/packages/ui/src/form/primitives/checkbox/checkbox.tsx
@@ -16,7 +16,10 @@ import type { CheckboxProps } from './types';
  * documentation.
  */
 export const Checkbox = forwardRef< HTMLSpanElement, CheckboxProps >(
-	function Checkbox( { className, indeterminate, ...restProps }, ref ) {
+	function UnforwardedCheckbox(
+		{ className, indeterminate, ...restProps },
+		ref
+	) {
 		return (
 			<_Checkbox.Root
 				ref={ ref }
diff --git a/packages/ui/src/form/primitives/combobox/chip-with-remove.tsx b/packages/ui/src/form/primitives/combobox/chip-with-remove.tsx
index d455d1ce06a61b..29d8f6e3c4f8de 100644
--- a/packages/ui/src/form/primitives/combobox/chip-with-remove.tsx
+++ b/packages/ui/src/form/primitives/combobox/chip-with-remove.tsx
@@ -15,7 +15,7 @@ import styles from './style.module.css';
 export const ChipWithRemove = forwardRef<
 	HTMLDivElement,
 	ComboboxChipWithRemoveProps
->( function ChipWithRemove(
+>( function UnforwardedChipWithRemove(
 	{
 		className,
 		children,
diff --git a/packages/ui/src/form/primitives/combobox/chips.tsx b/packages/ui/src/form/primitives/combobox/chips.tsx
index fe0b75c49f087d..fcd3891cd0436b 100644
--- a/packages/ui/src/form/primitives/combobox/chips.tsx
+++ b/packages/ui/src/form/primitives/combobox/chips.tsx
@@ -3,7 +3,7 @@ import { forwardRef } from '@wordpress/element';
 import type { ComboboxChipsProps } from './types';
 
 export const Chips = forwardRef< HTMLDivElement, ComboboxChipsProps >(
-	function Chips( props, ref ) {
+	function UnforwardedChips( props, ref ) {
 		return <_Combobox.Chips ref={ ref } { ...props } />;
 	}
 );
diff --git a/packages/ui/src/form/primitives/combobox/clear.tsx b/packages/ui/src/form/primitives/combobox/clear.tsx
index 5ae7cde96357ab..a68fb7a585a7c3 100644
--- a/packages/ui/src/form/primitives/combobox/clear.tsx
+++ b/packages/ui/src/form/primitives/combobox/clear.tsx
@@ -26,7 +26,10 @@ const DEFAULT_RENDER = (
  * A button that clears the selected value(s).
  */
 export const Clear = forwardRef< HTMLButtonElement, ComboboxClearProps >(
-	function Clear( { render = DEFAULT_RENDER, ...restProps }, ref ) {
+	function UnforwardedClear(
+		{ render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
 		return (
 			<_Combobox.Clear ref={ ref } render={ render } { ...restProps } />
 		);
diff --git a/packages/ui/src/form/primitives/combobox/empty.tsx b/packages/ui/src/form/primitives/combobox/empty.tsx
index 0096920d2d156a..78e57a005cd962 100644
--- a/packages/ui/src/form/primitives/combobox/empty.tsx
+++ b/packages/ui/src/form/primitives/combobox/empty.tsx
@@ -5,7 +5,7 @@ import type { ComboboxEmptyProps } from './types';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 
 export const Empty = forwardRef< HTMLDivElement, ComboboxEmptyProps >(
-	function Empty( { className, ...restProps }, ref ) {
+	function UnforwardedEmpty( { className, ...restProps }, ref ) {
 		return (
 			<_Combobox.Empty
 				className={ clsx( itemPopupStyles.empty, className ) }
diff --git a/packages/ui/src/form/primitives/combobox/group-label.tsx b/packages/ui/src/form/primitives/combobox/group-label.tsx
index 7d96c45e273912..c2246518b38928 100644
--- a/packages/ui/src/form/primitives/combobox/group-label.tsx
+++ b/packages/ui/src/form/primitives/combobox/group-label.tsx
@@ -10,7 +10,10 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * it is associated with.
  */
 export const GroupLabel = forwardRef< HTMLDivElement, ComboboxGroupLabelProps >(
-	function GroupLabel( { className, children, ...restProps }, ref ) {
+	function UnforwardedGroupLabel(
+		{ className, children, ...restProps },
+		ref
+	) {
 		return (
 			<Text
 				variant="heading-sm"
diff --git a/packages/ui/src/form/primitives/combobox/group.tsx b/packages/ui/src/form/primitives/combobox/group.tsx
index f4fdafbbc967c3..405ba59919b431 100644
--- a/packages/ui/src/form/primitives/combobox/group.tsx
+++ b/packages/ui/src/form/primitives/combobox/group.tsx
@@ -10,7 +10,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * `Combobox.Collection` components iterate over them.
  */
 export const Group = forwardRef< HTMLDivElement, ComboboxGroupProps >(
-	function Group( { className, children, ...restProps }, ref ) {
+	function UnforwardedGroup( { className, children, ...restProps }, ref ) {
 		return (
 			<_Combobox.Group
 				className={ clsx( itemPopupStyles.group, className ) }
diff --git a/packages/ui/src/form/primitives/combobox/input-group.tsx b/packages/ui/src/form/primitives/combobox/input-group.tsx
index d5ef60c2b4e4cc..2098d34298c5a4 100644
--- a/packages/ui/src/form/primitives/combobox/input-group.tsx
+++ b/packages/ui/src/form/primitives/combobox/input-group.tsx
@@ -9,7 +9,7 @@ import type { ComboboxInputGroupProps } from './types';
  * instead of the full control. Also adds `role="group"`.
  */
 export const InputGroup = forwardRef< HTMLDivElement, ComboboxInputGroupProps >(
-	function InputGroup( props, ref ) {
+	function UnforwardedInputGroup( props, ref ) {
 		return <_Combobox.InputGroup ref={ ref } { ...props } />;
 	}
 );
diff --git a/packages/ui/src/form/primitives/combobox/input.tsx b/packages/ui/src/form/primitives/combobox/input.tsx
index bb3048342bfe12..1f0ecd866203a4 100644
--- a/packages/ui/src/form/primitives/combobox/input.tsx
+++ b/packages/ui/src/form/primitives/combobox/input.tsx
@@ -18,7 +18,10 @@ const DEFAULT_RENDER = ( props: ComboboxInputProps ) => (
 );
 
 export const Input = forwardRef< HTMLInputElement, ComboboxInputProps >(
-	function Input( { render = DEFAULT_RENDER, ...restProps }, ref ) {
+	function UnforwardedInput(
+		{ render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
 		return (
 			<_Combobox.Input ref={ ref } render={ render } { ...restProps } />
 		);
diff --git a/packages/ui/src/form/primitives/combobox/item.tsx b/packages/ui/src/form/primitives/combobox/item.tsx
index 271317f3d77675..6a52132bccff66 100644
--- a/packages/ui/src/form/primitives/combobox/item.tsx
+++ b/packages/ui/src/form/primitives/combobox/item.tsx
@@ -9,7 +9,7 @@ import resetStyles from '../../../utils/css/resets.module.css';
 import type { ComboboxItemProps } from './types';
 
 export const Item = forwardRef< HTMLDivElement, ComboboxItemProps >(
-	function Item(
+	function UnforwardedItem(
 		{ className, children, variant = 'default', ...restProps },
 		ref
 	) {
diff --git a/packages/ui/src/form/primitives/combobox/list-body.tsx b/packages/ui/src/form/primitives/combobox/list-body.tsx
index 903f3bf4464213..8158df2cf3e427 100644
--- a/packages/ui/src/form/primitives/combobox/list-body.tsx
+++ b/packages/ui/src/form/primitives/combobox/list-body.tsx
@@ -7,7 +7,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * A layout container for the main scrolling area in the `List`, for holding `Item`s.
  */
 export const ListBody = forwardRef< HTMLDivElement, ComboboxListBodyProps >(
-	function ListBody( { render, ...props }, ref ) {
+	function UnforwardedListBody( { render, ...props }, ref ) {
 		const element = useRender( {
 			defaultTagName: 'div',
 			render,
diff --git a/packages/ui/src/form/primitives/combobox/list-footer.tsx b/packages/ui/src/form/primitives/combobox/list-footer.tsx
index f572b1f6916f6e..886de46b7126c1 100644
--- a/packages/ui/src/form/primitives/combobox/list-footer.tsx
+++ b/packages/ui/src/form/primitives/combobox/list-footer.tsx
@@ -8,7 +8,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * for holding a single `Item` that triggers the creation of a new item.
  */
 export const ListFooter = forwardRef< HTMLDivElement, ComboboxListFooterProps >(
-	function ListFooter( { render, ...props }, ref ) {
+	function UnforwardedListFooter( { render, ...props }, ref ) {
 		const element = useRender( {
 			defaultTagName: 'div',
 			render,
diff --git a/packages/ui/src/form/primitives/combobox/list.tsx b/packages/ui/src/form/primitives/combobox/list.tsx
index afbf930bff303b..919caf9428c9b3 100644
--- a/packages/ui/src/form/primitives/combobox/list.tsx
+++ b/packages/ui/src/form/primitives/combobox/list.tsx
@@ -5,7 +5,7 @@ import type { ComboboxListProps } from './types';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 
 export const List = forwardRef< HTMLDivElement, ComboboxListProps >(
-	function List( { className, ...restProps }, ref ) {
+	function UnforwardedList( { className, ...restProps }, ref ) {
 		return (
 			<_Combobox.List
 				className={ clsx( itemPopupStyles.list, className ) }
diff --git a/packages/ui/src/form/primitives/combobox/popup.tsx b/packages/ui/src/form/primitives/combobox/popup.tsx
index 7b5adb3ee4b51a..d5ec00581164ae 100644
--- a/packages/ui/src/form/primitives/combobox/popup.tsx
+++ b/packages/ui/src/form/primitives/combobox/popup.tsx
@@ -9,7 +9,7 @@ import { getItemPopupWidthClassName } from '../../../utils/css/item-popup';
 import type { ComboboxPopupProps } from './types';
 
 export const Popup = forwardRef< HTMLDivElement, ComboboxPopupProps >(
-	function Popup(
+	function UnforwardedPopup(
 		{ className, portal, positioner, width, ...restProps },
 		ref
 	) {
diff --git a/packages/ui/src/form/primitives/combobox/status.tsx b/packages/ui/src/form/primitives/combobox/status.tsx
index 777a3b957964a0..0f2160d02e01f0 100644
--- a/packages/ui/src/form/primitives/combobox/status.tsx
+++ b/packages/ui/src/form/primitives/combobox/status.tsx
@@ -13,7 +13,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * instead.
  */
 export const Status = forwardRef< HTMLDivElement, ComboboxStatusProps >(
-	function Status( { className, ...restProps }, ref ) {
+	function UnforwardedStatus( { className, ...restProps }, ref ) {
 		return (
 			<_Combobox.Status
 				className={ clsx( itemPopupStyles.status, className ) }
diff --git a/packages/ui/src/form/primitives/combobox/trigger.tsx b/packages/ui/src/form/primitives/combobox/trigger.tsx
index 637d58acc1b1f5..19491de1003d94 100644
--- a/packages/ui/src/form/primitives/combobox/trigger.tsx
+++ b/packages/ui/src/form/primitives/combobox/trigger.tsx
@@ -10,7 +10,7 @@ import { InputLayout } from '../input-layout';
 import type { ComboboxTriggerProps } from './types';
 
 export const Trigger = forwardRef< HTMLButtonElement, ComboboxTriggerProps >(
-	function Trigger(
+	function UnforwardedTrigger(
 		{
 			className,
 			children,
diff --git a/packages/ui/src/form/primitives/control-with-error/control-with-error.tsx b/packages/ui/src/form/primitives/control-with-error/control-with-error.tsx
index c36d79e4cbce54..97c8dc57c1dd59 100644
--- a/packages/ui/src/form/primitives/control-with-error/control-with-error.tsx
+++ b/packages/ui/src/form/primitives/control-with-error/control-with-error.tsx
@@ -58,7 +58,7 @@ const VALIDITY_VISIBLE_ATTRIBUTE = 'data-validity-visible';
 export const ControlWithError = forwardRef<
 	HTMLDivElement,
 	ControlWithErrorProps
->( function ControlWithError(
+>( function UnforwardedControlWithError(
 	{
 		required,
 		markWhenOptional,
diff --git a/packages/ui/src/form/primitives/control-with-error/test/control-with-error.browser.test.tsx b/packages/ui/src/form/primitives/control-with-error/test/control-with-error.browser.test.tsx
index 84eb27f13b7773..fb977bcb4406a6 100644
--- a/packages/ui/src/form/primitives/control-with-error/test/control-with-error.browser.test.tsx
+++ b/packages/ui/src/form/primitives/control-with-error/test/control-with-error.browser.test.tsx
@@ -330,7 +330,10 @@ describe( 'ControlWithError', () => {
 					value: string;
 					onChange: ( value: string ) => void;
 				}
-			>( function ClampedNumberInput( { label, value, onChange }, ref ) {
+			>( function UnforwardedClampedNumberInput(
+				{ label, value, onChange },
+				ref
+			) {
 				const [ innerValue, setInnerValue ] = useState( value );
 				useIsomorphicLayoutEffect( () => {
 					setInnerValue( value );
diff --git a/packages/ui/src/form/primitives/control-with-error/test/fixtures/validated-input-control.tsx b/packages/ui/src/form/primitives/control-with-error/test/fixtures/validated-input-control.tsx
index c01fed3d26cdd0..8253503e5a9010 100644
--- a/packages/ui/src/form/primitives/control-with-error/test/fixtures/validated-input-control.tsx
+++ b/packages/ui/src/form/primitives/control-with-error/test/fixtures/validated-input-control.tsx
@@ -5,7 +5,7 @@ import { ControlWithError } from '../../index';
 const ValidatedInput = forwardRef<
 	HTMLInputElement,
 	React.InputHTMLAttributes< HTMLInputElement > & { label?: string }
->( function ValidatedInput( { label, ...restProps }, ref ) {
+>( function UnforwardedValidatedInput( { label, ...restProps }, ref ) {
 	return <input ref={ ref } aria-label={ label } { ...restProps } />;
 } );
 
@@ -20,7 +20,7 @@ type ValidatedInputControlProps = React.ComponentProps<
 export const ValidatedInputControl = forwardRef<
 	HTMLInputElement,
 	ValidatedInputControlProps
->( function ValidatedInputControl(
+>( function UnforwardedValidatedInputControl(
 	{ required, markWhenOptional, customValidity, ...restProps },
 	forwardedRef
 ) {
diff --git a/packages/ui/src/form/primitives/field/control.tsx b/packages/ui/src/form/primitives/field/control.tsx
index 291522ccc7ccbf..d5417d7863f59b 100644
--- a/packages/ui/src/form/primitives/field/control.tsx
+++ b/packages/ui/src/form/primitives/field/control.tsx
@@ -3,7 +3,7 @@ import { forwardRef } from '@wordpress/element';
 import type { FieldControlProps } from './types';
 
 export const Control = forwardRef< HTMLInputElement, FieldControlProps >(
-	function Control( props, ref ) {
+	function UnforwardedControl( props, ref ) {
 		return <_Field.Control ref={ ref } { ...props } />;
 	}
 );
diff --git a/packages/ui/src/form/primitives/field/description.tsx b/packages/ui/src/form/primitives/field/description.tsx
index 4c9609708d4bdb..a068f828d96b59 100644
--- a/packages/ui/src/form/primitives/field/description.tsx
+++ b/packages/ui/src/form/primitives/field/description.tsx
@@ -8,7 +8,7 @@ import type { FieldDescriptionProps } from './types';
 export const Description = forwardRef<
 	HTMLParagraphElement,
 	FieldDescriptionProps
->( function Description( { className, ...restProps }, ref ) {
+>( function UnforwardedDescription( { className, ...restProps }, ref ) {
 	return (
 		<_Field.Description
 			ref={ ref }
diff --git a/packages/ui/src/form/primitives/field/details.tsx b/packages/ui/src/form/primitives/field/details.tsx
index 847124f467c9df..75e4753f711a97 100644
--- a/packages/ui/src/form/primitives/field/details.tsx
+++ b/packages/ui/src/form/primitives/field/details.tsx
@@ -19,7 +19,7 @@ import { VisuallyHidden } from '../../../visually-hidden';
  * so the readout is not unnecessarily verbose for screen reader users.
  */
 export const Details = forwardRef< HTMLDivElement, FieldDetailsProps >(
-	function Details( { className, ...restProps }, ref ) {
+	function UnforwardedDetails( { className, ...restProps }, ref ) {
 		return (
 			<>
 				{ /* VisuallyHidden is the host so that _Field.Description's
diff --git a/packages/ui/src/form/primitives/field/item.tsx b/packages/ui/src/form/primitives/field/item.tsx
index e2430b1967d93f..dce5862437a4ae 100644
--- a/packages/ui/src/form/primitives/field/item.tsx
+++ b/packages/ui/src/form/primitives/field/item.tsx
@@ -4,6 +4,6 @@ import type { FieldItemProps } from './types';
 
 export const Item: React.ForwardRefExoticComponent<
 	FieldItemProps & React.RefAttributes< HTMLDivElement >
-> = forwardRef( function Item( props, ref ) {
+> = forwardRef( function UnforwardedItem( props, ref ) {
 	return <_Field.Item ref={ ref } { ...props } />;
 } );
diff --git a/packages/ui/src/form/primitives/field/label.tsx b/packages/ui/src/form/primitives/field/label.tsx
index 69a278d8a9c9e2..14273b83d6af3f 100644
--- a/packages/ui/src/form/primitives/field/label.tsx
+++ b/packages/ui/src/form/primitives/field/label.tsx
@@ -6,7 +6,7 @@ import { VisuallyHidden } from '../../../visually-hidden';
 import type { FieldLabelProps } from './types';
 
 export const Label = forwardRef< HTMLLabelElement, FieldLabelProps >(
-	function Label(
+	function UnforwardedLabel(
 		{ className, hideFromVision, variant, ...restProps },
 		ref
 	) {
diff --git a/packages/ui/src/form/primitives/field/root.tsx b/packages/ui/src/form/primitives/field/root.tsx
index c131f8fadc0315..aa6795808dd8bb 100644
--- a/packages/ui/src/form/primitives/field/root.tsx
+++ b/packages/ui/src/form/primitives/field/root.tsx
@@ -18,16 +18,18 @@ const DEFAULT_RENDER = ( props: React.ComponentProps< typeof Stack > ) => (
  * Simply wrapping a control with this component does not guarantee
  * accessible labeling. See examples for how to associate the label in different cases.
  */
-export const Root = forwardRef< HTMLDivElement, FieldRootProps >( function Root(
-	{ className, render = DEFAULT_RENDER, ...restProps },
-	ref
-) {
-	return (
-		<_Field.Root
-			ref={ ref }
-			className={ clsx( resetStyles[ 'box-sizing' ], className ) }
-			render={ render }
-			{ ...restProps }
-		/>
-	);
-} );
+export const Root = forwardRef< HTMLDivElement, FieldRootProps >(
+	function UnforwardedRoot(
+		{ className, render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
+		return (
+			<_Field.Root
+				ref={ ref }
+				className={ clsx( resetStyles[ 'box-sizing' ], className ) }
+				render={ render }
+				{ ...restProps }
+			/>
+		);
+	}
+);
diff --git a/packages/ui/src/form/primitives/field/visual-label.tsx b/packages/ui/src/form/primitives/field/visual-label.tsx
index a8414b5edacc3c..67177cb84f258b 100644
--- a/packages/ui/src/form/primitives/field/visual-label.tsx
+++ b/packages/ui/src/form/primitives/field/visual-label.tsx
@@ -15,7 +15,10 @@ import type { FieldVisualLabelProps } from './types';
  * associated with a control.
  */
 export const VisualLabel = forwardRef< HTMLSpanElement, FieldVisualLabelProps >(
-	function VisualLabel( { className, render, variant, ...restProps }, ref ) {
+	function UnforwardedVisualLabel(
+		{ className, render, variant, ...restProps },
+		ref
+	) {
 		return useRender( {
 			defaultTagName: 'span',
 			render,
diff --git a/packages/ui/src/form/primitives/fieldset/description.tsx b/packages/ui/src/form/primitives/fieldset/description.tsx
index 09dedeb14838da..282fd137e7099a 100644
--- a/packages/ui/src/form/primitives/fieldset/description.tsx
+++ b/packages/ui/src/form/primitives/fieldset/description.tsx
@@ -10,7 +10,7 @@ import type { FieldsetDescriptionProps } from './types';
 export const FieldsetDescription = forwardRef<
 	HTMLParagraphElement,
 	FieldsetDescriptionProps
->( function FieldsetDescription(
+>( function UnforwardedFieldsetDescription(
 	{ className, id: idProp, render, ...restProps },
 	ref
 ) {
diff --git a/packages/ui/src/form/primitives/fieldset/details.tsx b/packages/ui/src/form/primitives/fieldset/details.tsx
index 1312be017f1bd6..361ba971d9357d 100644
--- a/packages/ui/src/form/primitives/fieldset/details.tsx
+++ b/packages/ui/src/form/primitives/fieldset/details.tsx
@@ -22,7 +22,10 @@ import type { FieldsetDetailsProps } from './types';
 export const FieldsetDetails = forwardRef<
 	HTMLDivElement,
 	FieldsetDetailsProps
->( function FieldsetDetails( { className, children, ...restProps }, ref ) {
+>( function UnforwardedFieldsetDetails(
+	{ className, children, ...restProps },
+	ref
+) {
 	const id = useId();
 	const { registerDescriptionId, unregisterDescriptionId } =
 		useFieldsetContext( 'Fieldset.Details' );
diff --git a/packages/ui/src/form/primitives/fieldset/legend.tsx b/packages/ui/src/form/primitives/fieldset/legend.tsx
index 9b2106472af91a..4f42a3c6559412 100644
--- a/packages/ui/src/form/primitives/fieldset/legend.tsx
+++ b/packages/ui/src/form/primitives/fieldset/legend.tsx
@@ -7,7 +7,7 @@ import styles from './style.module.css';
 import type { FieldsetLegendProps } from './types';
 
 export const FieldsetLegend = forwardRef< HTMLDivElement, FieldsetLegendProps >(
-	function FieldsetLegend(
+	function UnforwardedFieldsetLegend(
 		{ className, hideFromVision, ...restProps },
 		ref
 	) {
diff --git a/packages/ui/src/form/primitives/fieldset/root.tsx b/packages/ui/src/form/primitives/fieldset/root.tsx
index c9c8ba17e590b7..3778bb717e5f06 100644
--- a/packages/ui/src/form/primitives/fieldset/root.tsx
+++ b/packages/ui/src/form/primitives/fieldset/root.tsx
@@ -14,7 +14,10 @@ import type { FieldsetRootProps } from './types';
 export const FieldsetRoot = forwardRef<
 	HTMLFieldSetElement,
 	FieldsetRootProps
->( function FieldsetRoot( { className, children, ...restProps }, ref ) {
+>( function UnforwardedFieldsetRoot(
+	{ className, children, ...restProps },
+	ref
+) {
 	const [ descriptionId, setDescriptionId ] = useState< string >();
 
 	const contextValue = useMemo(
diff --git a/packages/ui/src/form/primitives/input-layout/input-layout.tsx b/packages/ui/src/form/primitives/input-layout/input-layout.tsx
index 11b327455b2a91..c9f9a0ee43ba19 100644
--- a/packages/ui/src/form/primitives/input-layout/input-layout.tsx
+++ b/packages/ui/src/form/primitives/input-layout/input-layout.tsx
@@ -10,7 +10,7 @@ import type { InputLayoutProps } from './types';
  * including disabled states and standard prefix/suffix slots.
  */
 export const InputLayout = forwardRef< HTMLDivElement, InputLayoutProps >(
-	function InputLayout(
+	function UnforwardedInputLayout(
 		{
 			className,
 			children,
diff --git a/packages/ui/src/form/primitives/input-layout/slot.tsx b/packages/ui/src/form/primitives/input-layout/slot.tsx
index 9bc2b64e2b4f00..70b53af41f732d 100644
--- a/packages/ui/src/form/primitives/input-layout/slot.tsx
+++ b/packages/ui/src/form/primitives/input-layout/slot.tsx
@@ -9,7 +9,7 @@ import type { InputLayoutSlotProps } from './types';
 export const InputLayoutSlot = forwardRef<
 	HTMLDivElement,
 	InputLayoutSlotProps
->( function InputLayoutSlot(
+>( function UnforwardedInputLayoutSlot(
 	{ padding = 'default', className, ...restProps },
 	ref
 ) {
diff --git a/packages/ui/src/form/primitives/input/input.tsx b/packages/ui/src/form/primitives/input/input.tsx
index 72b2f81a0e1251..0f699fc299e46a 100644
--- a/packages/ui/src/form/primitives/input/input.tsx
+++ b/packages/ui/src/form/primitives/input/input.tsx
@@ -12,27 +12,29 @@ import { InputLayout } from '../input-layout';
  *
  * Prefer `InputControl` when using with a standard label and description.
  */
-export const Input = forwardRef< HTMLElement, InputProps >( function Input(
-	{ className, size = 'default', prefix, suffix, style, ...restProps },
-	ref
-) {
-	return (
-		<InputLayout
-			className={ clsx(
-				focusStyles[ 'outset-ring--focus-within' ],
-				className
-			) }
-			style={ style }
-			size={ size }
-			visuallyDisabled={ restProps.disabled }
-			prefix={ prefix }
-			suffix={ suffix }
-		>
-			<_Input
-				ref={ ref }
-				className={ clsx( defenseStyles.input, styles.input ) }
-				{ ...restProps }
-			/>
-		</InputLayout>
-	);
-} );
+export const Input = forwardRef< HTMLElement, InputProps >(
+	function UnforwardedInput(
+		{ className, size = 'default', prefix, suffix, style, ...restProps },
+		ref
+	) {
+		return (
+			<InputLayout
+				className={ clsx(
+					focusStyles[ 'outset-ring--focus-within' ],
+					className
+				) }
+				style={ style }
+				size={ size }
+				visuallyDisabled={ restProps.disabled }
+				prefix={ prefix }
+				suffix={ suffix }
+			>
+				<_Input
+					ref={ ref }
+					className={ clsx( defenseStyles.input, styles.input ) }
+					{ ...restProps }
+				/>
+			</InputLayout>
+		);
+	}
+);
diff --git a/packages/ui/src/form/primitives/radio-group/radio-group.tsx b/packages/ui/src/form/primitives/radio-group/radio-group.tsx
index 321450cb299e8a..d1327fcb125446 100644
--- a/packages/ui/src/form/primitives/radio-group/radio-group.tsx
+++ b/packages/ui/src/form/primitives/radio-group/radio-group.tsx
@@ -16,7 +16,10 @@ const DEFAULT_RENDER = ( props: React.ComponentProps< typeof Stack > ) => (
  * give each `RadioGroup` its own accessible name.
  */
 export const RadioGroup = forwardRef< HTMLDivElement, RadioGroupProps >(
-	function RadioGroup( { render = DEFAULT_RENDER, ...restProps }, ref ) {
+	function UnforwardedRadioGroup(
+		{ render = DEFAULT_RENDER, ...restProps },
+		ref
+	) {
 		return <_RadioGroup ref={ ref } render={ render } { ...restProps } />;
 	}
 );
diff --git a/packages/ui/src/form/primitives/radio/radio.tsx b/packages/ui/src/form/primitives/radio/radio.tsx
index 65acf7942203e7..1801b821fecd52 100644
--- a/packages/ui/src/form/primitives/radio/radio.tsx
+++ b/packages/ui/src/form/primitives/radio/radio.tsx
@@ -11,22 +11,21 @@ import type { RadioProps } from './types';
  *
  * Must be rendered inside a `RadioGroup`.
  */
-export const Radio = forwardRef< HTMLSpanElement, RadioProps >( function Radio(
-	{ className, ...props },
-	ref
-) {
-	return (
-		<_Radio.Root
-			ref={ ref }
-			className={ clsx(
-				resetStyles[ 'box-sizing' ],
-				focusStyles[ 'outset-ring--focus' ],
-				styles.root,
-				className
-			) }
-			{ ...props }
-		>
-			<_Radio.Indicator className={ styles.indicator } />
-		</_Radio.Root>
-	);
-} );
+export const Radio = forwardRef< HTMLSpanElement, RadioProps >(
+	function UnforwardedRadio( { className, ...props }, ref ) {
+		return (
+			<_Radio.Root
+				ref={ ref }
+				className={ clsx(
+					resetStyles[ 'box-sizing' ],
+					focusStyles[ 'outset-ring--focus' ],
+					styles.root,
+					className
+				) }
+				{ ...props }
+			>
+				<_Radio.Indicator className={ styles.indicator } />
+			</_Radio.Root>
+		);
+	}
+);
diff --git a/packages/ui/src/form/primitives/searchable-chip-select/searchable-chip-select.tsx b/packages/ui/src/form/primitives/searchable-chip-select/searchable-chip-select.tsx
index 8c072b7bbf96f5..c209157071918e 100644
--- a/packages/ui/src/form/primitives/searchable-chip-select/searchable-chip-select.tsx
+++ b/packages/ui/src/form/primitives/searchable-chip-select/searchable-chip-select.tsx
@@ -45,7 +45,7 @@ function getInputSelectionHint( selectedCount: number ): string | undefined {
 export const SearchableChipSelect = forwardRef<
 	HTMLInputElement,
 	SearchableChipSelectProps
->( function SearchableChipSelect(
+>( function UnforwardedSearchableChipSelect(
 	{
 		children,
 		disabled,
diff --git a/packages/ui/src/form/primitives/searchable-select/item.tsx b/packages/ui/src/form/primitives/searchable-select/item.tsx
index aa1ea25469e53d..21ae3ab4812fe8 100644
--- a/packages/ui/src/form/primitives/searchable-select/item.tsx
+++ b/packages/ui/src/form/primitives/searchable-select/item.tsx
@@ -3,7 +3,7 @@ import { Item as ComboboxItem } from '../combobox/item';
 import type { SearchableSelectItemProps } from './types';
 
 export const Item = forwardRef< HTMLDivElement, SearchableSelectItemProps >(
-	function Item( props, ref ) {
+	function UnforwardedItem( props, ref ) {
 		return <ComboboxItem ref={ ref } { ...props } />;
 	}
 );
diff --git a/packages/ui/src/form/primitives/searchable-select/searchable-select.tsx b/packages/ui/src/form/primitives/searchable-select/searchable-select.tsx
index 3f7c20e38a8987..8a1c521f374159 100644
--- a/packages/ui/src/form/primitives/searchable-select/searchable-select.tsx
+++ b/packages/ui/src/form/primitives/searchable-select/searchable-select.tsx
@@ -65,7 +65,7 @@ function warnSearchableSelectProps(
 export const SearchableSelect = forwardRef<
 	HTMLButtonElement,
 	SearchableSelectProps
->( function SearchableSelect(
+>( function UnforwardedSearchableSelect(
 	{
 		children,
 		emptyContent = __( 'No results found.' ),
diff --git a/packages/ui/src/form/primitives/select/group-label.tsx b/packages/ui/src/form/primitives/select/group-label.tsx
index 784ba2acc0be8f..7edd34bd8b8fef 100644
--- a/packages/ui/src/form/primitives/select/group-label.tsx
+++ b/packages/ui/src/form/primitives/select/group-label.tsx
@@ -10,7 +10,10 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * it is associated with.
  */
 export const GroupLabel = forwardRef< HTMLDivElement, SelectGroupLabelProps >(
-	function GroupLabel( { className, children, ...restProps }, ref ) {
+	function UnforwardedGroupLabel(
+		{ className, children, ...restProps },
+		ref
+	) {
 		return (
 			<Text
 				variant="heading-sm"
diff --git a/packages/ui/src/form/primitives/select/group.tsx b/packages/ui/src/form/primitives/select/group.tsx
index f868cdd8139e10..71b172c5414c60 100644
--- a/packages/ui/src/form/primitives/select/group.tsx
+++ b/packages/ui/src/form/primitives/select/group.tsx
@@ -9,7 +9,7 @@ import itemPopupStyles from '../../../utils/css/item-popup.module.css';
  * `Select.GroupLabel`.
  */
 export const Group = forwardRef< HTMLDivElement, SelectGroupProps >(
-	function Group( { className, children, ...restProps }, ref ) {
+	function UnforwardedGroup( { className, children, ...restProps }, ref ) {
 		return (
 			<_Select.Group
 				className={ clsx( itemPopupStyles.group, className ) }
diff --git a/packages/ui/src/form/primitives/select/item-description.tsx b/packages/ui/src/form/primitives/select/item-description.tsx
index d0c55f2c7a79b5..13d3903dfa5864 100644
--- a/packages/ui/src/form/primitives/select/item-description.tsx
+++ b/packages/ui/src/form/primitives/select/item-description.tsx
@@ -12,7 +12,7 @@ import type { SelectItemDescriptionProps } from './types';
 export const ItemDescription = forwardRef<
 	HTMLSpanElement,
 	SelectItemDescriptionProps
->( function ItemDescription( { className, ...restProps }, ref ) {
+>( function UnforwardedItemDescription( { className, ...restProps }, ref ) {
 	return (
 		<Text
 			ref={ ref }
diff --git a/packages/ui/src/form/primitives/select/item-label.tsx b/packages/ui/src/form/primitives/select/item-label.tsx
index 4affc1a3a6f61a..dbbdc484521cf2 100644
--- a/packages/ui/src/form/primitives/select/item-label.tsx
+++ b/packages/ui/src/form/primitives/select/item-label.tsx
@@ -12,7 +12,10 @@ import type { SelectItemLabelProps } from './types';
  * value) or from `Select.Trigger` children.
  */
 export const ItemLabel = forwardRef< HTMLDivElement, SelectItemLabelProps >(
-	function ItemLabel( { children, className, render, ...restProps }, ref ) {
+	function UnforwardedItemLabel(
+		{ children, className, render, ...restProps },
+		ref
+	) {
 		return (
 			<Text
 				ref={ ref }
diff --git a/packages/ui/src/form/primitives/select/item.tsx b/packages/ui/src/form/primitives/select/item.tsx
index 6c7df1e5697fe4..bf232632bd15ca 100644
--- a/packages/ui/src/form/primitives/select/item.tsx
+++ b/packages/ui/src/form/primitives/select/item.tsx
@@ -19,7 +19,7 @@ const ITEM_CONTENT_COMPONENTS = {
 };
 
 export const Item = forwardRef< HTMLDivElement, SelectItemProps >(
-	function Item(
+	function UnforwardedItem(
 		{
 			className,
 			value,
diff --git a/packages/ui/src/form/primitives/select/popup.tsx b/packages/ui/src/form/primitives/select/popup.tsx
index d895c6291d7135..0e938a619604d5 100644
--- a/packages/ui/src/form/primitives/select/popup.tsx
+++ b/packages/ui/src/form/primitives/select/popup.tsx
@@ -10,7 +10,7 @@ import type { SelectPopupProps } from './types';
 import styles from './style.module.css';
 
 export const Popup = forwardRef< HTMLDivElement, SelectPopupProps >(
-	function Popup(
+	function UnforwardedPopup(
 		{ className, portal, positioner, width, children, ...restProps },
 		ref
 	) {
diff --git a/packages/ui/src/form/primitives/select/trigger.tsx b/packages/ui/src/form/primitives/select/trigger.tsx
index 2c94190ba50975..e819335e193f1a 100644
--- a/packages/ui/src/form/primitives/select/trigger.tsx
+++ b/packages/ui/src/form/primitives/select/trigger.tsx
@@ -10,7 +10,7 @@ import { Icon } from '../../../icon';
 import type { SelectTriggerProps } from './types';
 
 export const Trigger = forwardRef< HTMLButtonElement, SelectTriggerProps >(
-	function Trigger(
+	function UnforwardedTrigger(
 		{
 			className,
 			size,
diff --git a/packages/ui/src/form/primitives/switch/switch.tsx b/packages/ui/src/form/primitives/switch/switch.tsx
index 055e381e720fe3..b11082fa724cb1 100644
--- a/packages/ui/src/form/primitives/switch/switch.tsx
+++ b/packages/ui/src/form/primitives/switch/switch.tsx
@@ -13,7 +13,7 @@ import type { SwitchProps } from './types';
  * Prefer `SwitchControl` for labeled items.
  */
 export const Switch = forwardRef< HTMLSpanElement, SwitchProps >(
-	function Switch( { className, ...props }, ref ) {
+	function UnforwardedSwitch( { className, ...props }, ref ) {
 		return (
 			<_Switch.Root
 				ref={ ref }
diff --git a/packages/ui/src/form/primitives/textarea/textarea.tsx b/packages/ui/src/form/primitives/textarea/textarea.tsx
index 3a2908e3d2cbe6..021259caf45b1a 100644
--- a/packages/ui/src/form/primitives/textarea/textarea.tsx
+++ b/packages/ui/src/form/primitives/textarea/textarea.tsx
@@ -25,7 +25,7 @@ const wrappedRender = (
  * Prefer `TextareaControl` when using with a standard label and description.
  */
 export const Textarea = forwardRef< HTMLTextAreaElement, TextareaProps >(
-	function Textarea(
+	function UnforwardedTextarea(
 		{
 			className,
 			defaultValue,
diff --git a/packages/ui/src/form/radio-group-control/radio-group-control.tsx b/packages/ui/src/form/radio-group-control/radio-group-control.tsx
index 64c6ab9191d79a..2499274ce8a3a8 100644
--- a/packages/ui/src/form/radio-group-control/radio-group-control.tsx
+++ b/packages/ui/src/form/radio-group-control/radio-group-control.tsx
@@ -25,7 +25,7 @@ const TextContainer = ( {
 export const RadioGroupControl = forwardRef<
 	HTMLDivElement,
 	RadioGroupControlProps
->( function RadioGroupControl(
+>( function UnforwardedRadioGroupControl(
 	{
 		items,
 		className,
diff --git a/packages/ui/src/form/searchable-chip-select-control/searchable-chip-select-control.tsx b/packages/ui/src/form/searchable-chip-select-control/searchable-chip-select-control.tsx
index 6c06be97c473c4..4110985c3ff76b 100644
--- a/packages/ui/src/form/searchable-chip-select-control/searchable-chip-select-control.tsx
+++ b/packages/ui/src/form/searchable-chip-select-control/searchable-chip-select-control.tsx
@@ -9,7 +9,7 @@ import type { SearchableChipSelectControlProps } from './types';
 export const SearchableChipSelectControl = forwardRef<
 	HTMLInputElement,
 	SearchableChipSelectControlProps
->( function SearchableChipSelectControl(
+>( function UnforwardedSearchableChipSelectControl(
 	{
 		className,
 		label,
diff --git a/packages/ui/src/form/searchable-select-control/searchable-select-control.tsx b/packages/ui/src/form/searchable-select-control/searchable-select-control.tsx
index 341da443021912..85b6e80fba3b83 100644
--- a/packages/ui/src/form/searchable-select-control/searchable-select-control.tsx
+++ b/packages/ui/src/form/searchable-select-control/searchable-select-control.tsx
@@ -8,7 +8,7 @@ import type { SearchableSelectControlProps } from './types';
 export const SearchableSelectControl = forwardRef<
 	HTMLButtonElement,
 	SearchableSelectControlProps
->( function SearchableSelectControl(
+>( function UnforwardedSearchableSelectControl(
 	{
 		className,
 		label,
diff --git a/packages/ui/src/form/select-control/item.tsx b/packages/ui/src/form/select-control/item.tsx
index 86eb05c9fa790e..97c3cb24e565b7 100644
--- a/packages/ui/src/form/select-control/item.tsx
+++ b/packages/ui/src/form/select-control/item.tsx
@@ -5,7 +5,7 @@ import type { SelectItemProps } from '../primitives/select/types';
 export type SelectControlItemProps = Omit< SelectItemProps, 'size' >;
 
 export const Item = forwardRef< HTMLDivElement, SelectControlItemProps >(
-	function Item( props, ref ) {
+	function UnforwardedItem( props, ref ) {
 		return <Select.Item ref={ ref } { ...props } />;
 	}
 );
diff --git a/packages/ui/src/form/select-control/select-control.tsx b/packages/ui/src/form/select-control/select-control.tsx
index 625b87bf78eb85..c08540f49f5392 100644
--- a/packages/ui/src/form/select-control/select-control.tsx
+++ b/packages/ui/src/form/select-control/select-control.tsx
@@ -9,7 +9,7 @@ import type { SelectControlProps } from './types';
 export const SelectControl = forwardRef<
 	HTMLButtonElement,
 	SelectControlProps
->( function SelectControl(
+>( function UnforwardedSelectControl(
 	{
 		className,
 		children,
diff --git a/packages/ui/src/form/switch-control/switch-control.tsx b/packages/ui/src/form/switch-control/switch-control.tsx
index ad246353c02b61..e987a449fabc97 100644
--- a/packages/ui/src/form/switch-control/switch-control.tsx
+++ b/packages/ui/src/form/switch-control/switch-control.tsx
@@ -23,7 +23,7 @@ const TextContainer = ( {
  * A complete switch field with integrated label and description.
  */
 export const SwitchControl = forwardRef< HTMLSpanElement, SwitchControlProps >(
-	function SwitchControl(
+	function UnforwardedSwitchControl(
 		{
 			label,
 			description,
diff --git a/packages/ui/src/form/textarea-control/textarea-control.tsx b/packages/ui/src/form/textarea-control/textarea-control.tsx
index e5c6a038948441..05de5f9acfebb3 100644
--- a/packages/ui/src/form/textarea-control/textarea-control.tsx
+++ b/packages/ui/src/form/textarea-control/textarea-control.tsx
@@ -8,7 +8,7 @@ import type { TextareaControlProps } from './types';
 export const TextareaControl = forwardRef<
 	HTMLTextAreaElement,
 	TextareaControlProps
->( function TextareaControl(
+>( function UnforwardedTextareaControl(
 	{
 		className,
 		label,
diff --git a/packages/ui/src/form/with-validation/validated-input-control/validated-input-control.tsx b/packages/ui/src/form/with-validation/validated-input-control/validated-input-control.tsx
index a81effbc630eaa..3b2cb3a0666668 100644
--- a/packages/ui/src/form/with-validation/validated-input-control/validated-input-control.tsx
+++ b/packages/ui/src/form/with-validation/validated-input-control/validated-input-control.tsx
@@ -16,7 +16,7 @@ import type { ValidatedControlProps } from '../types';
 export const ValidatedInputControl = forwardRef<
 	HTMLInputElement,
 	React.ComponentProps< typeof InputControl > & ValidatedControlProps
->( function ValidatedInputControl(
+>( function UnforwardedValidatedInputControl(
 	{ required, markWhenOptional, customValidity, ...restProps },
 	forwardedRef
 ) {
diff --git a/packages/ui/src/form/with-validation/validated-textarea-control/validated-textarea-control.tsx b/packages/ui/src/form/with-validation/validated-textarea-control/validated-textarea-control.tsx
index 105180d7ffef4d..0f02a0683c9828 100644
--- a/packages/ui/src/form/with-validation/validated-textarea-control/validated-textarea-control.tsx
+++ b/packages/ui/src/form/with-validation/validated-textarea-control/validated-textarea-control.tsx
@@ -16,7 +16,7 @@ import type { ValidatedControlProps } from '../types';
 export const ValidatedTextareaControl = forwardRef<
 	HTMLTextAreaElement,
 	React.ComponentProps< typeof TextareaControl > & ValidatedControlProps
->( function ValidatedTextareaControl(
+>( function UnforwardedValidatedTextareaControl(
 	{ required, markWhenOptional, customValidity, ...restProps },
 	forwardedRef
 ) {
diff --git a/packages/ui/src/icon-button/icon-button.tsx b/packages/ui/src/icon-button/icon-button.tsx
index 5a3f18f2353af2..1d81116718b236 100644
--- a/packages/ui/src/icon-button/icon-button.tsx
+++ b/packages/ui/src/icon-button/icon-button.tsx
@@ -22,7 +22,7 @@ import { type IconButtonProps } from './types';
  * for when to use `Button`, `IconButton`, `Link`, or `LinkButton`.
  */
 export const IconButton = forwardRef< HTMLButtonElement, IconButtonProps >(
-	function IconButton(
+	function UnforwardedIconButton(
 		{
 			label,
 			className,
diff --git a/packages/ui/src/icon/icon.tsx b/packages/ui/src/icon/icon.tsx
index 7f5f5446b3aa4c..62db68682b25a4 100644
--- a/packages/ui/src/icon/icon.tsx
+++ b/packages/ui/src/icon/icon.tsx
@@ -11,23 +11,22 @@ import type { IconProps } from './types';
  * <Icon icon={ wordpress } />
  * ```
  */
-export const Icon = forwardRef< SVGSVGElement, IconProps >( function Icon(
-	{ icon, size = 24, style, ...restProps },
-	ref
-) {
-	const mergedStyle =
-		icon.props.style || style
-			? { ...icon.props.style, ...style }
-			: undefined;
+export const Icon = forwardRef< SVGSVGElement, IconProps >(
+	function UnforwardedIcon( { icon, size = 24, style, ...restProps }, ref ) {
+		const mergedStyle =
+			icon.props.style || style
+				? { ...icon.props.style, ...style }
+				: undefined;
 
-	return (
-		<SVG
-			ref={ ref }
-			{ ...icon.props }
-			{ ...restProps }
-			{ ...( mergedStyle ? { style: mergedStyle } : {} ) }
-			width={ size }
-			height={ size }
-		/>
-	);
-} );
+		return (
+			<SVG
+				ref={ ref }
+				{ ...icon.props }
+				{ ...restProps }
+				{ ...( mergedStyle ? { style: mergedStyle } : {} ) }
+				width={ size }
+				height={ size }
+			/>
+		);
+	}
+);
diff --git a/packages/ui/src/link-button/icon.tsx b/packages/ui/src/link-button/icon.tsx
index 89bbc1a2bd0997..005461ad477ec5 100644
--- a/packages/ui/src/link-button/icon.tsx
+++ b/packages/ui/src/link-button/icon.tsx
@@ -3,7 +3,7 @@ import { ButtonIcon } from '../button/icon';
 import { type LinkButtonIconProps } from './types';
 
 export const LinkButtonIcon = forwardRef< SVGSVGElement, LinkButtonIconProps >(
-	function LinkButtonIcon( props, ref ) {
+	function UnforwardedLinkButtonIcon( props, ref ) {
 		return <ButtonIcon ref={ ref } { ...props } />;
 	}
 );
diff --git a/packages/ui/src/link-button/link-button.tsx b/packages/ui/src/link-button/link-button.tsx
index 76333af9a5513a..725ab008a3e63e 100644
--- a/packages/ui/src/link-button/link-button.tsx
+++ b/packages/ui/src/link-button/link-button.tsx
@@ -13,7 +13,7 @@ import styles from './style.module.css';
  * for when to use `Button`, `IconButton`, `Link`, or `LinkButton`.
  */
 export const LinkButton = forwardRef< HTMLAnchorElement, LinkButtonProps >(
-	function LinkButton(
+	function UnforwardedLinkButton(
 		{
 			tone = 'brand',
 			variant = 'solid',
diff --git a/packages/ui/src/link/link.tsx b/packages/ui/src/link/link.tsx
index f03e14e73aceec..b6030ea496321f 100644
--- a/packages/ui/src/link/link.tsx
+++ b/packages/ui/src/link/link.tsx
@@ -15,53 +15,55 @@ import defenseStyles from '../utils/css/global-css-defense.module.css';
  * See the [Usage Guidelines](https://wordpress.github.io/gutenberg/?path=/docs/design-system-components-button-usage-guidelines--docs)
  * for when to use `Button`, `IconButton`, `Link`, or `LinkButton`.
  */
-export const Link = forwardRef< HTMLAnchorElement, LinkProps >( function Link(
-	{
-		children,
-		variant = 'default',
-		tone = 'brand',
-		openInNewTab = false,
-		target,
-		render,
-		className,
-		...props
-	},
-	ref
-) {
-	const shouldShowNewTabIndicator =
-		openInNewTab || /^_blank$/i.test( target ?? '' );
-	const element = useRender( {
-		render,
-		defaultTagName: 'a',
-		ref,
-		props: mergeProps< 'a' >( props, {
-			className: clsx(
-				defenseStyles.a,
-				resetStyles[ 'box-sizing' ],
-				focusStyles[ 'outset-ring--focus-except-active' ],
-				variant !== 'unstyled' && styles.link,
-				variant !== 'unstyled' && styles[ `is-${ tone }` ],
-				variant === 'unstyled' && styles[ 'is-unstyled' ],
-				className
-			),
-			target: target ?? ( openInNewTab ? '_blank' : undefined ),
-			children: (
-				<>
-					{ children }
-					{ shouldShowNewTabIndicator && (
-						<span
-							className={ styles[ 'link-icon' ] }
-							role="img"
-							aria-label={
-								/* translators: accessibility text appended to link text */
-								__( '(opens in a new tab)' )
-							}
-						/>
-					) }
-				</>
-			),
-		} ),
-	} );
+export const Link = forwardRef< HTMLAnchorElement, LinkProps >(
+	function UnforwardedLink(
+		{
+			children,
+			variant = 'default',
+			tone = 'brand',
+			openInNewTab = false,
+			target,
+			render,
+			className,
+			...props
+		},
+		ref
+	) {
+		const shouldShowNewTabIndicator =
+			openInNewTab || /^_blank$/i.test( target ?? '' );
+		const element = useRender( {
+			render,
+			defaultTagName: 'a',
+			ref,
+			props: mergeProps< 'a' >( props, {
+				className: clsx(
+					defenseStyles.a,
+					resetStyles[ 'box-sizing' ],
+					focusStyles[ 'outset-ring--focus-except-active' ],
+					variant !== 'unstyled' && styles.link,
+					variant !== 'unstyled' && styles[ `is-${ tone }` ],
+					variant === 'unstyled' && styles[ 'is-unstyled' ],
+					className
+				),
+				target: target ?? ( openInNewTab ? '_blank' : undefined ),
+				children: (
+					<>
+						{ children }
+						{ shouldShowNewTabIndicator && (
+							<span
+								className={ styles[ 'link-icon' ] }
+								role="img"
+								aria-label={
+									/* translators: accessibility text appended to link text */
+									__( '(opens in a new tab)' )
+								}
+							/>
+						) }
+					</>
+				),
+			} ),
+		} );
 
-	return element;
-} );
+		return element;
+	}
+);
diff --git a/packages/ui/src/popover/stories/utils.tsx b/packages/ui/src/popover/stories/utils.tsx
index ca1c48ab90bd02..1a1b6b5f5c8628 100644
--- a/packages/ui/src/popover/stories/utils.tsx
+++ b/packages/ui/src/popover/stories/utils.tsx
@@ -60,7 +60,7 @@ export function useMeasure< TRef extends HTMLElement >() {
 export const GenericIframe = forwardRef<
 	HTMLIFrameElement,
 	GenericIframeProps
->( function GenericIframe( { children, ...props }, ref ) {
+>( function UnforwardedGenericIframe( { children, ...props }, ref ) {
 	const [ containerNode, setContainerNode ] = useState< HTMLElement | null >(
 		null
 	);
diff --git a/packages/ui/src/skeleton/skeleton.tsx b/packages/ui/src/skeleton/skeleton.tsx
index bff6b36ae50bee..fbc3c31cfcc913 100644
--- a/packages/ui/src/skeleton/skeleton.tsx
+++ b/packages/ui/src/skeleton/skeleton.tsx
@@ -12,7 +12,7 @@ import styles from './style.module.css';
  * `style` and `className`.
  */
 export const Skeleton = forwardRef< HTMLDivElement, SkeletonProps >(
-	function Skeleton( { render, ...props }, ref ) {
+	function UnforwardedSkeleton( { render, ...props }, ref ) {
 		return useRender( {
 			render,
 			ref,
diff --git a/packages/ui/src/spinner/spinner.tsx b/packages/ui/src/spinner/spinner.tsx
index 1cc70b3c64cea1..a04cb1c91b3218 100644
--- a/packages/ui/src/spinner/spinner.tsx
+++ b/packages/ui/src/spinner/spinner.tsx
@@ -7,7 +7,7 @@ import styles from './style.module.css';
  * A component used to notify users that their action is being processed.
  */
 export const Spinner = forwardRef< SVGSVGElement, ComponentProps< 'svg' > >(
-	function Spinner( { className, ...props }, ref ) {
+	function UnforwardedSpinner( { className, ...props }, ref ) {
 		return (
 			<svg
 				className={ clsx( styles.spinner, className ) }
diff --git a/packages/ui/src/stack/stack.tsx b/packages/ui/src/stack/stack.tsx
index dd44ef7a980633..b2374a47bc8cb0 100644
--- a/packages/ui/src/stack/stack.tsx
+++ b/packages/ui/src/stack/stack.tsx
@@ -20,23 +20,28 @@ const gapTokens: Record< GapSize, string > = {
  * A flexible layout component using CSS Flexbox for consistent spacing and alignment.
  * Built on design tokens for predictable spacing values.
  */
-export const Stack = forwardRef< HTMLDivElement, StackProps >( function Stack(
-	{ direction, gap, align, justify, wrap, render, ...props },
-	ref
-) {
-	const style: React.CSSProperties = {
-		gap: gap && gapTokens[ gap ],
-		alignItems: align,
-		justifyContent: justify,
-		flexDirection: direction,
-		flexWrap: wrap,
-	};
+export const Stack = forwardRef< HTMLDivElement, StackProps >(
+	function UnforwardedStack(
+		{ direction, gap, align, justify, wrap, render, ...props },
+		ref
+	) {
+		const style: React.CSSProperties = {
+			gap: gap && gapTokens[ gap ],
+			alignItems: align,
+			justifyContent: justify,
+			flexDirection: direction,
+			flexWrap: wrap,
+		};
 
-	const element = useRender( {
-		render,
-		ref,
-		props: mergeProps< 'div' >( props, { style, className: styles.stack } ),
-	} );
+		const element = useRender( {
+			render,
+			ref,
+			props: mergeProps< 'div' >( props, {
+				style,
+				className: styles.stack,
+			} ),
+		} );
 
-	return element;
-} );
+		return element;
+	}
+);
diff --git a/packages/ui/src/tabs/stories/index.story.tsx b/packages/ui/src/tabs/stories/index.story.tsx
index bf4b29d45a305e..37caf93a193fac 100644
--- a/packages/ui/src/tabs/stories/index.story.tsx
+++ b/packages/ui/src/tabs/stories/index.story.tsx
@@ -80,7 +80,7 @@ export const Minimal: StoryObj< typeof Tabs.Root > = {
 };
 
 export const SizeAndOverflowPlayground: StoryObj< typeof Tabs.Root > = {
-	render: function SizeAndOverflowPlayground( props ) {
+	render: function SizeAndOverflowPlaygroundRender( props ) {
 		const [ fullWidth, setFullWidth ] = useState( false );
 		return (
 			<div>
diff --git a/packages/ui/src/tabs/tab.tsx b/packages/ui/src/tabs/tab.tsx
index d94fc3240c4dbc..1703b9647771e9 100644
--- a/packages/ui/src/tabs/tab.tsx
+++ b/packages/ui/src/tabs/tab.tsx
@@ -13,20 +13,25 @@ import type { TabProps } from './types';
  * `Tabs` is a collection of React components that combine to render
  * an [ARIA-compliant tabs pattern](https://www.w3.org/WAI/ARIA/apg/patterns/tabs/).
  */
-export const Tab = forwardRef< HTMLButtonElement, TabProps >( function Tab(
-	{ className, children, ...otherProps },
-	forwardedRef
-) {
-	useRegisterTab();
+export const Tab = forwardRef< HTMLButtonElement, TabProps >(
+	function UnforwardedTab(
+		{ className, children, ...otherProps },
+		forwardedRef
+	) {
+		useRegisterTab();
 
-	return (
-		<_Tabs.Tab
-			ref={ forwardedRef }
-			className={ clsx( styles.tab, className ) }
-			{ ...otherProps }
-		>
-			<span className={ styles[ 'tab-children' ] }>{ children }</span>
-			<Icon icon={ chevronRight } className={ styles[ 'tab-chevron' ] } />
-		</_Tabs.Tab>
-	);
-} );
+		return (
+			<_Tabs.Tab
+				ref={ forwardedRef }
+				className={ clsx( styles.tab, className ) }
+				{ ...otherProps }
+			>
+				<span className={ styles[ 'tab-children' ] }>{ children }</span>
+				<Icon
+					icon={ chevronRight }
+					className={ styles[ 'tab-chevron' ] }
+				/>
+			</_Tabs.Tab>
+		);
+	}
+);
diff --git a/packages/ui/src/text/text.tsx b/packages/ui/src/text/text.tsx
index c2c36e8691fab0..ab1729a2577224 100644
--- a/packages/ui/src/text/text.tsx
+++ b/packages/ui/src/text/text.tsx
@@ -9,24 +9,26 @@ import defenseStyles from '../utils/css/global-css-defense.module.css';
  * A text component for rendering content with predefined typographic variants.
  * Built on design tokens for consistent typography across the UI.
  */
-export const Text = forwardRef< HTMLSpanElement, TextProps >( function Text(
-	{ variant = 'body-md', render, className, ...props },
-	ref
-) {
-	const element = useRender( {
-		render,
-		defaultTagName: 'span',
-		ref,
-		props: mergeProps< 'span' >( props, {
-			className: clsx(
-				styles.text,
-				defenseStyles.heading,
-				defenseStyles.p,
-				styles[ variant ],
-				className
-			),
-		} ),
-	} );
+export const Text = forwardRef< HTMLSpanElement, TextProps >(
+	function UnforwardedText(
+		{ variant = 'body-md', render, className, ...props },
+		ref
+	) {
+		const element = useRender( {
+			render,
+			defaultTagName: 'span',
+			ref,
+			props: mergeProps< 'span' >( props, {
+				className: clsx(
+					styles.text,
+					defenseStyles.heading,
+					defenseStyles.p,
+					styles[ variant ],
+					className
+				),
+			} ),
+		} );
 
-	return element;
-} );
+		return element;
+	}
+);
diff --git a/packages/ui/src/utils/keyboard-shortcut.tsx b/packages/ui/src/utils/keyboard-shortcut.tsx
index a40f305f99093e..601fcb43c8d035 100644
--- a/packages/ui/src/utils/keyboard-shortcut.tsx
+++ b/packages/ui/src/utils/keyboard-shortcut.tsx
@@ -66,7 +66,10 @@ const KeyboardShortcutDescription = forwardRef<
 		descriptionId: string;
 		shortcut: KeyboardShortcut;
 	}
->( function KeyboardShortcutDescription( { descriptionId, shortcut }, ref ) {
+>( function UnforwardedKeyboardShortcutDescription(
+	{ descriptionId, shortcut },
+	ref
+) {
 	return (
 		<VisuallyHidden
 			id={ descriptionId }
@@ -92,7 +95,7 @@ const KeyboardShortcutDisplay = forwardRef<
 		className?: string;
 		shortcut: KeyboardShortcut;
 	}
->( function KeyboardShortcutDisplay( { className, shortcut }, ref ) {
+>( function UnforwardedKeyboardShortcutDisplay( { className, shortcut }, ref ) {
 	return (
 		<span ref={ ref } aria-hidden="true" className={ className } dir="ltr">
 			{ shortcut.displayShortcut }
diff --git a/packages/ui/src/visually-hidden/visually-hidden.tsx b/packages/ui/src/visually-hidden/visually-hidden.tsx
index 3290de96eb4aee..70b18ce50af590 100644
--- a/packages/ui/src/visually-hidden/visually-hidden.tsx
+++ b/packages/ui/src/visually-hidden/visually-hidden.tsx
@@ -26,7 +26,7 @@ import styles from './style.module.css';
  * ```
  */
 export const VisuallyHidden = forwardRef< HTMLDivElement, VisuallyHiddenProps >(
-	function VisuallyHidden( { render, ...restProps }, ref ) {
+	function UnforwardedVisuallyHidden( { render, ...restProps }, ref ) {
 		const element = useRender( {
 			render,
 			ref,

From c37a22e388bed4c91f215be1cddf2b8c198d6b1d Mon Sep 17 00:00:00 2001
From: Manzoor Wani <manzoorwani.jk@gmail.com>
Date: Tue, 29 Sep 2026 11:50:43 +0530
Subject: [PATCH 3/4] Rename remaining inner functions that shadow their outer
 variable

---
 packages/compose/src/hooks/use-dragging/index.ts             | 4 ++--
 .../src/components/dataviews-layouts/grid/composite-grid.tsx | 4 ++--
 packages/grid/src/dashboard-grid/index.tsx                   | 2 +-
 packages/grid/src/dashboard-lanes/index.tsx                  | 2 +-
 packages/theme/src/color-ramps/stories/ramp-table.tsx        | 5 ++++-
 .../src/components/widget-chrome/widget-chrome.tsx           | 5 ++++-
 .../src/components/widget-header/widget-header-infotip.tsx   | 2 +-
 .../src/components/widgets/widget-resize-handle.tsx          | 2 +-
 packages/widget-dashboard/src/components/widgets/widgets.tsx | 2 +-
 packages/widget-dashboard/src/stories/index.story.tsx        | 5 ++++-
 .../widget-dashboard/src/test/host-links.browser.test.tsx    | 5 ++++-
 packages/widget-dashboard/src/widget-dashboard.tsx           | 2 +-
 .../src/components/widget-render/stories/index.story.tsx     | 2 +-
 packages/widget-primitives/src/widget-host/host-link.tsx     | 2 +-
 .../dashboard/widget-host/dashboard-widget-host-provider.tsx | 2 +-
 15 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/packages/compose/src/hooks/use-dragging/index.ts b/packages/compose/src/hooks/use-dragging/index.ts
index 820f21e79b3f3b..9f476858cd05a0 100644
--- a/packages/compose/src/hooks/use-dragging/index.ts
+++ b/packages/compose/src/hooks/use-dragging/index.ts
@@ -34,10 +34,10 @@ export default function useDragging( {
 	}, [] );
 
 	const endDrag = useCallback(
-		function endDrag( event?: MouseEvent ): void {
+		function handleEndDrag( event?: MouseEvent ): void {
 			eventsRef.current.onDragEnd?.( event );
 			document.removeEventListener( 'mousemove', onMouseMove );
-			document.removeEventListener( 'mouseup', endDrag );
+			document.removeEventListener( 'mouseup', handleEndDrag );
 			setIsDragging( false );
 		},
 		[ onMouseMove ]
diff --git a/packages/dataviews/src/components/dataviews-layouts/grid/composite-grid.tsx b/packages/dataviews/src/components/dataviews-layouts/grid/composite-grid.tsx
index 365366965b1f6d..988081034178e4 100644
--- a/packages/dataviews/src/components/dataviews-layouts/grid/composite-grid.tsx
+++ b/packages/dataviews/src/components/dataviews-layouts/grid/composite-grid.tsx
@@ -74,7 +74,7 @@ interface GridItemProps< Item > extends HTMLAttributes< HTMLDivElement > {
 }
 
 const GridItem = forwardRef< HTMLDivElement, GridItemProps< any > >(
-	function GridItem(
+	function UnforwardedGridItem(
 		{
 			view,
 			selection,
@@ -120,7 +120,7 @@ const GridItem = forwardRef< HTMLDivElement, GridItemProps< any > >(
 			[ forwardedRef ]
 		);
 		useIntersectionObserver( elementRef, posinset );
-		const instanceId = useInstanceId( GridItem );
+		const instanceId = useInstanceId( UnforwardedGridItem );
 
 		const isSelected = selection.includes( id );
 
diff --git a/packages/grid/src/dashboard-grid/index.tsx b/packages/grid/src/dashboard-grid/index.tsx
index a39905bd29176b..b43391c56b319f 100644
--- a/packages/grid/src/dashboard-grid/index.tsx
+++ b/packages/grid/src/dashboard-grid/index.tsx
@@ -99,7 +99,7 @@ const NO_SORT_STRATEGY = () => null;
  * @param ref   Forwarded to the grid's root `<div>`.
  */
 export const DashboardGrid = forwardRef< HTMLDivElement, DashboardGridProps >(
-	function DashboardGrid( props, ref ) {
+	function UnforwardedDashboardGrid( props, ref ) {
 		const {
 			layout,
 			columns,
diff --git a/packages/grid/src/dashboard-lanes/index.tsx b/packages/grid/src/dashboard-lanes/index.tsx
index 6af5dc120e4b66..a39fb81b1a083b 100644
--- a/packages/grid/src/dashboard-lanes/index.tsx
+++ b/packages/grid/src/dashboard-lanes/index.tsx
@@ -100,7 +100,7 @@ const NO_SORT_STRATEGY = () => null;
  * @param ref   Forwarded to the surface's root `<div>`.
  */
 export const DashboardLanes = forwardRef< HTMLDivElement, DashboardLanesProps >(
-	function DashboardLanes( props, ref ) {
+	function UnforwardedDashboardLanes( props, ref ) {
 		const {
 			layout,
 			columns,
diff --git a/packages/theme/src/color-ramps/stories/ramp-table.tsx b/packages/theme/src/color-ramps/stories/ramp-table.tsx
index 849805582eb6fb..019ab49eb2fbe0 100644
--- a/packages/theme/src/color-ramps/stories/ramp-table.tsx
+++ b/packages/theme/src/color-ramps/stories/ramp-table.tsx
@@ -148,7 +148,10 @@ function ColorSample( {
 }
 
 export const RampTable = forwardRef< HTMLDivElement, RampTableProps >(
-	function RampTable( { label, ramps, warnings = [] }, forwardedRef ) {
+	function UnforwardedRampTable(
+		{ label, ramps, warnings = [] },
+		forwardedRef
+	) {
 		const hasAdjustedSeed = ramps.some( ( { seed, ramp } ) =>
 			isSeedAdjusted( seed.value, ramp[ seed.name ] )
 		);
diff --git a/packages/widget-dashboard/src/components/widget-chrome/widget-chrome.tsx b/packages/widget-dashboard/src/components/widget-chrome/widget-chrome.tsx
index 4a05c129baead8..4f859714ceb4d6 100644
--- a/packages/widget-dashboard/src/components/widget-chrome/widget-chrome.tsx
+++ b/packages/widget-dashboard/src/components/widget-chrome/widget-chrome.tsx
@@ -61,7 +61,10 @@ export interface WidgetChromeProps {
  * the missing and resolving states.
  */
 export const WidgetChrome = forwardRef< HTMLDivElement, WidgetChromeProps >(
-	function WidgetChrome( { widget, index, className, headerToolbar }, ref ) {
+	function UnforwardedWidgetChrome(
+		{ widget, index, className, headerToolbar },
+		ref
+	) {
 		const { widgetTypes, isResolvingWidgetTypes, editMode } =
 			useDashboardInternalContext();
 		const widgetType = widgetTypes.find( ( t ) => t.name === widget.type );
diff --git a/packages/widget-dashboard/src/components/widget-header/widget-header-infotip.tsx b/packages/widget-dashboard/src/components/widget-header/widget-header-infotip.tsx
index 6d82d8856e34d9..ce0286bc8e2eda 100644
--- a/packages/widget-dashboard/src/components/widget-header/widget-header-infotip.tsx
+++ b/packages/widget-dashboard/src/components/widget-header/widget-header-infotip.tsx
@@ -37,7 +37,7 @@ export interface WidgetInfotipProps {
 export const WidgetInfotip = forwardRef<
 	HTMLButtonElement,
 	WidgetInfotipProps
->( function WidgetInfotip(
+>( function UnforwardedWidgetInfotip(
 	{ title, showTitle = false, content, links },
 	ref
 ): React.ReactNode {
diff --git a/packages/widget-dashboard/src/components/widgets/widget-resize-handle.tsx b/packages/widget-dashboard/src/components/widgets/widget-resize-handle.tsx
index d6ff4c596bef24..816d4deef985e6 100644
--- a/packages/widget-dashboard/src/components/widgets/widget-resize-handle.tsx
+++ b/packages/widget-dashboard/src/components/widgets/widget-resize-handle.tsx
@@ -15,7 +15,7 @@ type WidgetResizeHandleProps = Omit< ResizeHandleRenderProps, 'ref' >;
 export const WidgetResizeHandle = forwardRef<
 	HTMLDivElement,
 	WidgetResizeHandleProps
->( function WidgetResizeHandle(
+>( function UnforwardedWidgetResizeHandle(
 	{ listeners, attributes, verticalResizable, isResizing },
 	ref
 ) {
diff --git a/packages/widget-dashboard/src/components/widgets/widgets.tsx b/packages/widget-dashboard/src/components/widgets/widgets.tsx
index 3665dd3823957c..df0ce032b62d02 100644
--- a/packages/widget-dashboard/src/components/widgets/widgets.tsx
+++ b/packages/widget-dashboard/src/components/widgets/widgets.tsx
@@ -122,7 +122,7 @@ export interface WidgetsProps {
  * or masonry, picked from `gridSettings.model`).
  */
 export const Widgets = forwardRef< HTMLDivElement, WidgetsProps >(
-	function Widgets( { className }, ref ) {
+	function UnforwardedWidgets( { className }, ref ) {
 		const {
 			layout,
 			onLayoutChange,
diff --git a/packages/widget-dashboard/src/stories/index.story.tsx b/packages/widget-dashboard/src/stories/index.story.tsx
index 05eaeafff48e55..6a234c60a2650e 100644
--- a/packages/widget-dashboard/src/stories/index.story.tsx
+++ b/packages/widget-dashboard/src/stories/index.story.tsx
@@ -485,7 +485,10 @@ const DEMO_NAVIGATE_EVENT = 'widget-dashboard-demo-navigate';
 const DemoRouteLink = forwardRef<
 	HTMLAnchorElement,
 	{ path: string } & Omit< ComponentPropsWithoutRef< 'a' >, 'href' >
->( function DemoRouteLink( { path, onClick, children, ...props }, ref ) {
+>( function UnforwardedDemoRouteLink(
+	{ path, onClick, children, ...props },
+	ref
+) {
 	return (
 		<a
 			ref={ ref }
diff --git a/packages/widget-dashboard/src/test/host-links.browser.test.tsx b/packages/widget-dashboard/src/test/host-links.browser.test.tsx
index eaf839593b97c5..472120662a1b21 100644
--- a/packages/widget-dashboard/src/test/host-links.browser.test.tsx
+++ b/packages/widget-dashboard/src/test/host-links.browser.test.tsx
@@ -25,7 +25,10 @@ function createHost( onNavigate?: ( path: string ) => void ) {
 	const HostLink = forwardRef<
 		HTMLAnchorElement,
 		{ path: string } & Omit< ComponentPropsWithoutRef< 'a' >, 'href' >
-	>( function HostLink( { path, onClick, children, ...props }, ref ) {
+	>( function UnforwardedHostLink(
+		{ path, onClick, children, ...props },
+		ref
+	) {
 		receivedRef.push( ref !== null );
 
 		return (
diff --git a/packages/widget-dashboard/src/widget-dashboard.tsx b/packages/widget-dashboard/src/widget-dashboard.tsx
index abeee3bbed7dd0..a097d1a79a9035 100644
--- a/packages/widget-dashboard/src/widget-dashboard.tsx
+++ b/packages/widget-dashboard/src/widget-dashboard.tsx
@@ -55,7 +55,7 @@ import type { WidgetDashboardProps } from './types';
  * internal context.
  */
 export const WidgetDashboard = Object.assign(
-	function WidgetDashboard( {
+	function WidgetDashboardRoot( {
 		layout,
 		onLayoutChange,
 		onLayoutReset,
diff --git a/packages/widget-primitives/src/components/widget-render/stories/index.story.tsx b/packages/widget-primitives/src/components/widget-render/stories/index.story.tsx
index 4c9899461f9ad5..12a0a0fedd085a 100644
--- a/packages/widget-primitives/src/components/widget-render/stories/index.story.tsx
+++ b/packages/widget-primitives/src/components/widget-render/stories/index.story.tsx
@@ -850,7 +850,7 @@ const DEMO_NAVIGATE_EVENT = 'wp-widget-primitives-demo-navigate';
 const RouteLink = forwardRef<
 	HTMLAnchorElement,
 	{ path: string } & Omit< ComponentPropsWithoutRef< 'a' >, 'href' >
->( function RouteLink( { path, onClick, children, ...props }, ref ) {
+>( function UnforwardedRouteLink( { path, onClick, children, ...props }, ref ) {
 	return (
 		<a
 			ref={ ref }
diff --git a/packages/widget-primitives/src/widget-host/host-link.tsx b/packages/widget-primitives/src/widget-host/host-link.tsx
index 756605147d964a..d4874dafbf6d25 100644
--- a/packages/widget-primitives/src/widget-host/host-link.tsx
+++ b/packages/widget-primitives/src/widget-host/host-link.tsx
@@ -24,7 +24,7 @@ interface HostLinkProps extends Omit<
  * @param {HostLinkProps} props Component props.
  */
 export const HostLink = forwardRef< HTMLAnchorElement, HostLinkProps >(
-	function HostLink( { href, children, ...props }, ref ) {
+	function UnforwardedHostLink( { href, children, ...props }, ref ) {
 		const { links } = useWidgetHost();
 		const { download, target } = props;
 		const opensNewDocument =
diff --git a/routes/dashboard/widget-host/dashboard-widget-host-provider.tsx b/routes/dashboard/widget-host/dashboard-widget-host-provider.tsx
index 0200e42c9e3e38..c133e39707d76f 100644
--- a/routes/dashboard/widget-host/dashboard-widget-host-provider.tsx
+++ b/routes/dashboard/widget-host/dashboard-widget-host-provider.tsx
@@ -34,7 +34,7 @@ function toRouteTarget( path: string ): {
 const DashboardRouteLink = forwardRef<
 	HTMLAnchorElement,
 	{ path: string } & Omit< ComponentPropsWithoutRef< 'a' >, 'href' >
->( function DashboardRouteLink( { path, ...props }, ref ) {
+>( function UnforwardedDashboardRouteLink( { path, ...props }, ref ) {
 	return <Link ref={ ref } { ...toRouteTarget( path ) } { ...props } />;
 } );
 

From 488263a17ca98713f288afdeabb3bba250a4ab6d Mon Sep 17 00:00:00 2001
From: Manzoor Wani <manzoorwani.jk@gmail.com>
Date: Tue, 29 Sep 2026 11:50:48 +0530
Subject: [PATCH 4/4] Upgrade typescript-eslint to v8.70.1

Removes the 8.60.0 pin added in #83754 now that the no-shadow violations are fixed.
---
 package-lock.json                   | 769 ++--------------------------
 packages/eslint-plugin/CHANGELOG.md |   2 +-
 packages/eslint-plugin/package.json |   4 +-
 syncpack.config.mjs                 |   7 -
 test/unit/package.json              |   2 +-
 tools/eslint/package.json           |   2 +-
 6 files changed, 37 insertions(+), 749 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d29bc22b2c9f9..a9945348900bcd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13109,16 +13109,16 @@
 			"integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.0.tgz",
-			"integrity": "sha512-QYb/sa74/s7OKMbACMjrYnGspj9Hs5YI5aaffSL65UfeBUzVzBJfVo3oWSpbzPurvm7yaCCo2Lk7lVj610HqKw==",
+			"version": "8.70.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.70.1.tgz",
+			"integrity": "sha512-nDNrUQ/4ruSNYbu749TRY7cfrzPtoLHEXSNBI8aaNY32LlZCajixqRf3FqcKC4p5Cam4VOHYx/t+i5+nKXvrqA==",
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.12.2",
-				"@typescript-eslint/scope-manager": "8.60.0",
-				"@typescript-eslint/type-utils": "8.60.0",
-				"@typescript-eslint/utils": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0",
+				"@typescript-eslint/scope-manager": "8.70.1",
+				"@typescript-eslint/type-utils": "8.70.1",
+				"@typescript-eslint/utils": "8.70.1",
+				"@typescript-eslint/visitor-keys": "8.70.1",
 				"ignore": "^7.0.5",
 				"natural-compare": "^1.4.0",
 				"ts-api-utils": "^2.5.0"
@@ -13131,178 +13131,11 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.60.0",
-				"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
-			"integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/tsconfig-utils": "^8.60.0",
-				"@typescript-eslint/types": "^8.60.0",
-				"debug": "^4.4.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
-			"integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
-			"integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
-			"integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
-			"integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/project-service": "8.60.0",
-				"@typescript-eslint/tsconfig-utils": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0",
-				"debug": "^4.4.3",
-				"minimatch": "^10.2.2",
-				"semver": "^7.7.3",
-				"tinyglobby": "^0.2.15",
-				"ts-api-utils": "^2.5.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz",
-			"integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==",
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.9.1",
-				"@typescript-eslint/scope-manager": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/typescript-estree": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
+				"@typescript-eslint/parser": "^8.70.1",
 				"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
 				"typescript": ">=4.8.4 <6.1.0"
 			}
 		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
-			"integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"eslint-visitor-keys": "^5.0.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/balanced-match": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-			"license": "MIT",
-			"engines": {
-				"node": "18 || 20 || >=22"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
-			"version": "5.0.12",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
-			"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^4.0.2"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-			"integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^20.19.0 || ^22.13.0 || >=24"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
 		"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
 			"version": "7.0.9",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.9.tgz",
@@ -13312,31 +13145,16 @@
 				"node": ">= 4"
 			}
 		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
-			"version": "10.2.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
-			"integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"brace-expansion": "^5.0.8"
-			},
-			"engines": {
-				"node": "18 || 20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.0.tgz",
-			"integrity": "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg==",
+			"version": "8.70.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.70.1.tgz",
+			"integrity": "sha512-nO974WLllwhSFWQXnMLj6nDGa8f0khKEz1JzpPJ1u7Vm/4X1X6ZHajpoknU4bb41vJyMB0HHVyS2GqdhWfIXZw==",
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/typescript-estree": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0",
+				"@typescript-eslint/scope-manager": "8.70.1",
+				"@typescript-eslint/types": "8.70.1",
+				"@typescript-eslint/typescript-estree": "8.70.1",
+				"@typescript-eslint/visitor-keys": "8.70.1",
 				"debug": "^4.4.3"
 			},
 			"engines": {
@@ -13351,165 +13169,6 @@
 				"typescript": ">=4.8.4 <6.1.0"
 			}
 		},
-		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
-			"integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/tsconfig-utils": "^8.60.0",
-				"@typescript-eslint/types": "^8.60.0",
-				"debug": "^4.4.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
-			"integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
-			"integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
-			"integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
-			"integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/project-service": "8.60.0",
-				"@typescript-eslint/tsconfig-utils": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0",
-				"debug": "^4.4.3",
-				"minimatch": "^10.2.2",
-				"semver": "^7.7.3",
-				"tinyglobby": "^0.2.15",
-				"ts-api-utils": "^2.5.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
-			"integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"eslint-visitor-keys": "^5.0.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/balanced-match": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-			"license": "MIT",
-			"engines": {
-				"node": "18 || 20 || >=22"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-			"version": "5.0.12",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
-			"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^4.0.2"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-			"integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^20.19.0 || ^22.13.0 || >=24"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-			"version": "10.2.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
-			"integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"brace-expansion": "^5.0.8"
-			},
-			"engines": {
-				"node": "18 || 20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@typescript-eslint/project-service": {
 			"version": "8.70.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.70.1.tgz",
@@ -13565,110 +13224,15 @@
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.0.tgz",
-			"integrity": "sha512-SX46wEUtitCpq7AN38HkUU/+zvUpdKf7ephtWAFgckH8O7PQIyL5gvrhQgBLuEYgLfuKWOVvWVskMbuFHAz5xg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/typescript-estree": "8.60.0",
-				"@typescript-eslint/utils": "8.60.0",
-				"debug": "^4.4.3",
-				"ts-api-utils": "^2.5.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/project-service": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
-			"integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/tsconfig-utils": "^8.60.0",
-				"@typescript-eslint/types": "^8.60.0",
-				"debug": "^4.4.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
-			"integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
-			"integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
-			"integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
-			"integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
+			"version": "8.70.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.70.1.tgz",
+			"integrity": "sha512-7zKTnyvaVWqzLZHPFQtX1hVHqgkMC+WebPWakNCSyrQVbIP1AM0L0TlBZtACldIRb6PptI8Odk+jyZ5kP3B1VA==",
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/project-service": "8.60.0",
-				"@typescript-eslint/tsconfig-utils": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0",
+				"@typescript-eslint/types": "8.70.1",
+				"@typescript-eslint/typescript-estree": "8.70.1",
+				"@typescript-eslint/utils": "8.70.1",
 				"debug": "^4.4.3",
-				"minimatch": "^10.2.2",
-				"semver": "^7.7.3",
-				"tinyglobby": "^0.2.15",
 				"ts-api-utils": "^2.5.0"
 			},
 			"engines": {
@@ -13678,98 +13242,11 @@
 				"type": "opencollective",
 				"url": "https://opencollective.com/typescript-eslint"
 			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz",
-			"integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==",
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.9.1",
-				"@typescript-eslint/scope-manager": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/typescript-estree": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
 				"typescript": ">=4.8.4 <6.1.0"
 			}
 		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
-			"integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"eslint-visitor-keys": "^5.0.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/balanced-match": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-			"license": "MIT",
-			"engines": {
-				"node": "18 || 20 || >=22"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
-			"version": "5.0.12",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
-			"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^4.0.2"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-			"integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^20.19.0 || ^22.13.0 || >=24"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-			"version": "10.2.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
-			"integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"brace-expansion": "^5.0.8"
-			},
-			"engines": {
-				"node": "18 || 20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/@typescript-eslint/types": {
 			"version": "8.70.1",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.70.1.tgz",
@@ -39702,132 +39179,15 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.0.tgz",
-			"integrity": "sha512-9f65qWLZdAW9m1JaxBDUHcqRUfL8bkxxXL7XxEfI+F09q56PkBvIfCjLF3yInsDM/BBmwkqmCQdCZe/RYlIWEw==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.60.0",
-				"@typescript-eslint/parser": "8.60.0",
-				"@typescript-eslint/typescript-estree": "8.60.0",
-				"@typescript-eslint/utils": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/project-service": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
-			"integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/tsconfig-utils": "^8.60.0",
-				"@typescript-eslint/types": "^8.60.0",
-				"debug": "^4.4.3"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
-			"integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/tsconfig-utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
-			"integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
-			"integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
-			"integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/project-service": "8.60.0",
-				"@typescript-eslint/tsconfig-utils": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/visitor-keys": "8.60.0",
-				"debug": "^4.4.3",
-				"minimatch": "^10.2.2",
-				"semver": "^7.7.3",
-				"tinyglobby": "^0.2.15",
-				"ts-api-utils": "^2.5.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.1.0"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz",
-			"integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==",
+			"version": "8.70.1",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.70.1.tgz",
+			"integrity": "sha512-AcWG7KDjZ2THNXsgwttMaGmzVi0VFRlFYfqFHYQRbDpF3owuYbuiL8c7UUrd2k8s3PoSfIQrWfrGXfcElrWLYA==",
 			"license": "MIT",
 			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.9.1",
-				"@typescript-eslint/scope-manager": "8.60.0",
-				"@typescript-eslint/types": "8.60.0",
-				"@typescript-eslint/typescript-estree": "8.60.0"
+				"@typescript-eslint/eslint-plugin": "8.70.1",
+				"@typescript-eslint/parser": "8.70.1",
+				"@typescript-eslint/typescript-estree": "8.70.1",
+				"@typescript-eslint/utils": "8.70.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -39841,71 +39201,6 @@
 				"typescript": ">=4.8.4 <6.1.0"
 			}
 		},
-		"node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.60.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
-			"integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.60.0",
-				"eslint-visitor-keys": "^5.0.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/balanced-match": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-			"license": "MIT",
-			"engines": {
-				"node": "18 || 20 || >=22"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/brace-expansion": {
-			"version": "5.0.12",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
-			"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^4.0.2"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/eslint-visitor-keys": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
-			"integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^20.19.0 || ^22.13.0 || >=24"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/typescript-eslint/node_modules/minimatch": {
-			"version": "10.2.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
-			"integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"brace-expansion": "^5.0.8"
-			},
-			"engines": {
-				"node": "18 || 20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/uc.micro": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
@@ -44501,12 +43796,12 @@
 				"eslint-plugin-react-hooks": "^7.1.1",
 				"globals": "^16.0.0",
 				"requireindex": "^1.2.0",
-				"typescript-eslint": "8.60.0"
+				"typescript-eslint": "^8.70.1"
 			},
 			"devDependencies": {
 				"@types/eslint": "^9",
 				"@types/estree": "^1.0.8",
-				"@typescript-eslint/parser": "8.60.0",
+				"@typescript-eslint/parser": "^8.70.1",
 				"eslint": "^10.0.0",
 				"typescript": "npm:@typescript/typescript6@^6.0.2",
 				"vitest": "^5.0.0"
@@ -47965,7 +47260,7 @@
 				"@testing-library/react": "^16.3.3",
 				"@testing-library/user-event": "^14.6.1",
 				"@types/node": "^24.13.3",
-				"@typescript-eslint/parser": "8.60.0",
+				"@typescript-eslint/parser": "^8.70.1",
 				"@vitejs/plugin-react-swc": "^4.3.3",
 				"@vitest/browser-playwright": "^5.0.0",
 				"@wordpress/html-entities": "file:../../packages/html-entities",
@@ -48263,7 +47558,7 @@
 				"globals": "^16.0.0",
 				"react": "^18.3.1",
 				"typescript": "npm:@typescript/typescript6@^6.0.2",
-				"typescript-eslint": "8.60.0"
+				"typescript-eslint": "^8.70.1"
 			}
 		},
 		"tools/eslint/node_modules/balanced-match": {
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 613968978ac153..0af70902cdd660 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -8,7 +8,7 @@
 
 ### Bug Fixes
 
--   Pin `typescript-eslint` to `8.60.0`, whose peer range includes TypeScript 6.0. Later versions report `const Foo = forwardRef( function Foo() {} )` under `@typescript-eslint/no-shadow` ([#83754](https://github.com/WordPress/gutenberg/pull/83754)).
+-   Update `typescript-eslint` to `^8.70.1`, whose peer range includes TypeScript 6.0 ([#83754](https://github.com/WordPress/gutenberg/pull/83754)).
 
 ## 27.0.0 (2026-09-23)
 
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 8b33c8c69fdbe5..c967d0b2312cca 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -58,12 +58,12 @@
 		"eslint-plugin-react-hooks": "^7.1.1",
 		"globals": "^16.0.0",
 		"requireindex": "^1.2.0",
-		"typescript-eslint": "8.60.0"
+		"typescript-eslint": "^8.70.1"
 	},
 	"devDependencies": {
 		"@types/eslint": "^9",
 		"@types/estree": "^1.0.8",
-		"@typescript-eslint/parser": "8.60.0",
+		"@typescript-eslint/parser": "^8.70.1",
 		"eslint": "^10.0.0",
 		"typescript": "npm:@typescript/typescript6@^6.0.2",
 		"vitest": "^5.0.0"
diff --git a/syncpack.config.mjs b/syncpack.config.mjs
index f2c6b92a854e19..13f867c48ca595 100644
--- a/syncpack.config.mjs
+++ b/syncpack.config.mjs
@@ -46,13 +46,6 @@ export default {
 			dependencyTypes: [ 'prod', 'dev' ],
 			range: '',
 		},
-		{
-			label: '`typescript-eslint` 8.60.1+ reports `const Foo = forwardRef( function Foo() {} )` under `no-shadow`. Pin 8.60.0 until those names are updated.',
-			dependencies: [ 'typescript-eslint', '@typescript-eslint/parser' ],
-			packages: [ '**' ],
-			dependencyTypes: [ 'prod', 'dev' ],
-			range: '',
-		},
 		{
 			label: 'All dependencies must use caret ranges.',
 			packages: [ '**' ],
diff --git a/test/unit/package.json b/test/unit/package.json
index d478590ae07d47..56ddcef0f7217a 100644
--- a/test/unit/package.json
+++ b/test/unit/package.json
@@ -27,7 +27,7 @@
 		"@testing-library/react": "^16.3.3",
 		"@testing-library/user-event": "^14.6.1",
 		"@types/node": "^24.13.3",
-		"@typescript-eslint/parser": "8.60.0",
+		"@typescript-eslint/parser": "^8.70.1",
 		"@vitejs/plugin-react-swc": "^4.3.3",
 		"@vitest/browser-playwright": "^5.0.0",
 		"@wordpress/html-entities": "file:../../packages/html-entities",
diff --git a/tools/eslint/package.json b/tools/eslint/package.json
index fc22fe5b2f4651..4931c8b3587507 100644
--- a/tools/eslint/package.json
+++ b/tools/eslint/package.json
@@ -38,7 +38,7 @@
 		"globals": "^16.0.0",
 		"react": "^18.3.1",
 		"typescript": "npm:@typescript/typescript6@^6.0.2",
-		"typescript-eslint": "8.60.0"
+		"typescript-eslint": "^8.70.1"
 	},
 	"publishConfig": {
 		"access": "public"