Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore: types cleanup for react 19 (#44941)

Gildas Garciac3119ea1eabf
diff --git a/apps/design-system/registry/default/example/page-layout-list.tsx b/apps/design-system/registry/default/example/page-layout-list.tsx
index 7b5dc84a157..f9448ebb9e4 100644
--- a/apps/design-system/registry/default/example/page-layout-list.tsx
+++ b/apps/design-system/registry/default/example/page-layout-list.tsx
@@ -26,7 +26,7 @@ import {
} from 'ui-patterns/PageHeader'
import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
-export default function PageLayoutList(): React.JSX.Element {
+export default function PageLayoutList() {
const functions = [
{
id: 1,
diff --git a/apps/studio/components/interfaces/Linter/Linter.constants.ts b/apps/studio/components/interfaces/Linter/Linter.constants.ts
index 3ef516b5b4c..e9c740c507e 100644
--- a/apps/studio/components/interfaces/Linter/Linter.constants.ts
+++ b/apps/studio/components/interfaces/Linter/Linter.constants.ts
@@ -1,3 +1,5 @@
+import { ReactNode } from 'react'
+
import { Lint } from '@/data/lint/lint-query'
export enum LINTER_LEVELS {
@@ -9,7 +11,7 @@ export enum LINTER_LEVELS {
export type LintInfo = {
name: string
title: string
- icon: JSX.Element
+ icon: ReactNode
link: (args: { projectRef: string; metadata: Lint['metadata'] }) => string
linkText: string
docsLink: string
diff --git a/apps/studio/components/interfaces/Organization/Usage/Usage.constants.tsx b/apps/studio/components/interfaces/Organization/Usage/Usage.constants.tsx
index 1be62c7b6de..550e996f7ea 100644
--- a/apps/studio/components/interfaces/Organization/Usage/Usage.constants.tsx
+++ b/apps/studio/components/interfaces/Organization/Usage/Usage.constants.tsx
@@ -1,3 +1,4 @@
+import { ReactNode } from 'react'
import { Admonition } from 'ui-patterns'
import { USAGE_APPROACHING_THRESHOLD } from '@/components/interfaces/Billing/Billing.constants'
@@ -60,7 +61,7 @@ export interface CategoryAttribute {
chartPrefix?: 'Max' | 'Average' | 'Cumulative'
chartSuffix?: string
chartDescription: string
- additionalInfo?: (usage?: OrgUsageResponse) => JSX.Element | null
+ additionalInfo?: (usage?: OrgUsageResponse) => ReactNode | null
}
export type CategoryMetaKey = 'egress' | 'sizeCount' | 'activity' | 'compute' | 'logs'
diff --git a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx
index 2c3d66d1ec7..ca7f8b752de 100644
--- a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx
+++ b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx
@@ -3,7 +3,7 @@ import { geoCentroid } from 'd3-geo'
import sumBy from 'lodash/sumBy'
import { ChevronRight } from 'lucide-react'
import { useTheme } from 'next-themes'
-import { Fragment, useRef, useState } from 'react'
+import { Fragment, useRef, useState, type ReactNode } from 'react'
import { ComposableMap, Geographies, Geography, Marker, ZoomableGroup } from 'react-simple-maps'
import {
Alert_Shadcn_,
@@ -576,7 +576,7 @@ export const RequestsByCountryMapRenderer = (
if (code) present.add(code)
}
- const markers: JSX.Element[] = []
+ const markers: ReactNode[] = []
for (const iso2 in countsByIso2) {
const count = countsByIso2[iso2]
if (count <= 0) continue
diff --git a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.types.ts b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.types.ts
index c325a2baca9..84e843fada2 100644
--- a/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.types.ts
+++ b/apps/studio/components/interfaces/UnifiedLogs/UnifiedLogs.types.ts
@@ -1,4 +1,5 @@
-import { type inferParserType } from 'nuqs'
+import type { inferParserType } from 'nuqs'
+import type { ReactNode } from 'react'
import { LOG_TYPES, SEARCH_PARAMS_PARSER } from './UnifiedLogs.constants'
@@ -50,7 +51,7 @@ export type SheetField<TData, TMeta = Record<string, unknown>> = {
totalRowsFetched: number
} & TMeta
}
- ) => JSX.Element | null | string
+ ) => ReactNode
condition?: (props: TData) => boolean
className?: string
skeletonClassName?: string
diff --git a/apps/studio/components/layouts/Tabs/ActionCard.tsx b/apps/studio/components/layouts/Tabs/ActionCard.tsx
index 14f5472b2df..1866920d9c8 100644
--- a/apps/studio/components/layouts/Tabs/ActionCard.tsx
+++ b/apps/studio/components/layouts/Tabs/ActionCard.tsx
@@ -1,7 +1,8 @@
+import type { ReactNode } from 'react'
import { Badge, Card } from 'ui'
export const ActionCard = (card: {
- icon: JSX.Element
+ icon: ReactNode
title: string
description: string
bgColor: string
diff --git a/apps/studio/components/to-be-cleaned/Table.tsx b/apps/studio/components/to-be-cleaned/Table.tsx
index 17c0aa1db6f..aa0d7e2cdc5 100644
--- a/apps/studio/components/to-be-cleaned/Table.tsx
+++ b/apps/studio/components/to-be-cleaned/Table.tsx
@@ -1,8 +1,8 @@
-import { PropsWithChildren } from 'react'
+import type { PropsWithChildren, ReactNode } from 'react'
interface TableProps {
- body: JSX.Element | JSX.Element[]
- head?: JSX.Element | JSX.Element[]
+ body: ReactNode
+ head?: ReactNode
className?: string
containerClassName?: string
borderless?: boolean
diff --git a/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx b/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx
index edb63921b73..382ea6b1131 100644
--- a/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx
@@ -1,4 +1,4 @@
-import type { PropsWithChildren } from 'react'
+import type { PropsWithChildren, ReactNode } from 'react'
import {
cn,
Collapsible,
@@ -8,8 +8,8 @@ import {
type ToolProps = PropsWithChildren<{
className?: string
- label: string | JSX.Element
- icon?: JSX.Element
+ label: ReactNode
+ icon?: ReactNode
}>
export function Tool({ className, label, icon, children }: ToolProps) {
diff --git a/apps/studio/components/ui/ActionCard.tsx b/apps/studio/components/ui/ActionCard.tsx
index 401112986a1..f5e939f9ab5 100644
--- a/apps/studio/components/ui/ActionCard.tsx
+++ b/apps/studio/components/ui/ActionCard.tsx
@@ -1,11 +1,11 @@
-import { JSX, ReactNode } from 'react'
+import type { ReactNode } from 'react'
import { Badge, Card, cn } from 'ui'
export const ActionCard = (card: {
- icon: JSX.Element
+ icon: ReactNode
title: string
bgColor?: string
- description?: string | ReactNode
+ description?: ReactNode
isBeta?: boolean
className?: string
onClick?: () => void
diff --git a/apps/studio/components/ui/Charts/Charts.utils.tsx b/apps/studio/components/ui/Charts/Charts.utils.tsx
index 3b412a289c6..613c8ecc266 100644
--- a/apps/studio/components/ui/Charts/Charts.utils.tsx
+++ b/apps/studio/components/ui/Charts/Charts.utils.tsx
@@ -1,5 +1,5 @@
import dayjs from 'dayjs'
-import { FC, PropsWithChildren, useMemo } from 'react'
+import { useMemo, type FC, type ReactElement } from 'react'
import { ResponsiveContainer } from 'recharts'
import { DateTimeFormats } from './Charts.constants'
@@ -232,7 +232,7 @@ export const useChartSize = (
}
) => {
const minHeight = sizeMap[size]
- const Container: FC<PropsWithChildren & { className?: string }> = useMemo(
+ const Container: FC<{ children: ReactElement; className?: string }> = useMemo(
() =>
({ className, children }) => (
<ResponsiveContainer
@@ -241,7 +241,7 @@ export const useChartSize = (
minHeight={minHeight}
width="100%"
>
- {children as JSX.Element}
+ {children}
</ResponsiveContainer>
),
[size]
diff --git a/apps/studio/components/ui/Charts/ComposedChart.tsx b/apps/studio/components/ui/Charts/ComposedChart.tsx
index 3bedcc265b5..6d2ac414874 100644
--- a/apps/studio/components/ui/Charts/ComposedChart.tsx
+++ b/apps/studio/components/ui/Charts/ComposedChart.tsx
@@ -664,13 +664,13 @@ export function ComposedChart({
}}
/>
</RechartComposedChart>
- <ChartHighlightActions
- chartHighlight={chartHighlight}
- updateDateRange={updateDateRange}
- actions={highlightActions}
- chartId={chartId}
- />
</Container>
+ <ChartHighlightActions
+ chartHighlight={chartHighlight}
+ updateDateRange={updateDateRange}
+ actions={highlightActions}
+ chartId={chartId}
+ />
{data && (
<div
className="text-foreground-lighter -mt-9 flex items-center justify-between text-xs"
diff --git a/apps/studio/components/ui/DataTable/DataTable.types.ts b/apps/studio/components/ui/DataTable/DataTable.types.ts
index 19d2b5d77f3..d147394feaf 100644
--- a/apps/studio/components/ui/DataTable/DataTable.types.ts
+++ b/apps/studio/components/ui/DataTable/DataTable.types.ts
@@ -1,3 +1,5 @@
+import type { ReactNode } from 'react'
+
// TODO: we could type the value(!) especially when using enums
export type Option = {
label: string
@@ -18,7 +20,7 @@ export type Input = {
export type Checkbox = {
type: 'checkbox'
- component?: (props: Option) => JSX.Element | null
+ component?: (props: Option) => ReactNode
options?: Option[]
}
diff --git a/apps/studio/components/ui/FormBoxEmpty.tsx b/apps/studio/components/ui/FormBoxEmpty.tsx
index ba6e22eb5a4..f2b5f032d6f 100644
--- a/apps/studio/components/ui/FormBoxEmpty.tsx
+++ b/apps/studio/components/ui/FormBoxEmpty.tsx
@@ -1,8 +1,8 @@
-import { ReactText } from 'react'
+import type { ReactNode } from 'react'
interface Props {
- icon: JSX.Element
- text: ReactText
+ icon: ReactNode
+ text: ReactNode
}
const FormBoxEmpty = ({ icon, text }: Props) => {
diff --git a/apps/studio/components/ui/InfiniteList.tsx b/apps/studio/components/ui/InfiniteList.tsx
index 3ef24f3ebfb..8505c1149e5 100644
--- a/apps/studio/components/ui/InfiniteList.tsx
+++ b/apps/studio/components/ui/InfiniteList.tsx
@@ -22,7 +22,7 @@ import { cn, Skeleton } from 'ui'
// any here is intentional to allow for generic components and does not affect
// type safety of the wrapped component
// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const typedMemo = <Component extends (props: any) => JSX.Element | null>(
+const typedMemo = <Component extends (props: any) => ReactNode>(
component: Component,
propsAreEqual?: (
prevProps: Readonly<Parameters<Component>[0]>,
diff --git a/apps/studio/components/ui/Panel.tsx b/apps/studio/components/ui/Panel.tsx
index 09dc11416ed..effcb3ccbec 100644
--- a/apps/studio/components/ui/Panel.tsx
+++ b/apps/studio/components/ui/Panel.tsx
@@ -1,11 +1,11 @@
import { Megaphone } from 'lucide-react'
-import { forwardRef, PropsWithChildren, ReactNode } from 'react'
+import { forwardRef, type PropsWithChildren, type ReactNode } from 'react'
import { Badge, Button, cn, Loading } from 'ui'
interface PanelProps {
className?: string
id?: string
- footer?: JSX.Element | false
+ footer?: ReactNode
loading?: boolean
noMargin?: boolean
title?: ReactNode | false
diff --git a/apps/www/components/Enterprise/Performance.tsx b/apps/www/components/Enterprise/Performance.tsx
index abffa0336dc..ec1bd9819c1 100644
--- a/apps/www/components/Enterprise/Performance.tsx
+++ b/apps/www/components/Enterprise/Performance.tsx
@@ -1,12 +1,11 @@
-import React, { FC } from 'react'
-
import SectionContainer from '~/components/Layouts/SectionContainer'
import UsersGrowthChart from '~/components/UsersGrowthChart'
+import React, { type FC, type ReactNode } from 'react'
interface Props {
id: string
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
highlights: Highlight[]
}
diff --git a/apps/www/components/Enterprise/Security.tsx b/apps/www/components/Enterprise/Security.tsx
index e9153edbb9f..e3cb68933b8 100644
--- a/apps/www/components/Enterprise/Security.tsx
+++ b/apps/www/components/Enterprise/Security.tsx
@@ -1,14 +1,14 @@
import type { LucideIcon } from 'lucide-react'
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { TextLink } from 'ui-patterns/TextLink'
import SectionContainer from '@/components/Layouts/SectionContainer'
export interface SecuritySectionProps {
id: string
- label: string | JSX.Element
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ label: ReactNode
+ heading: ReactNode
+ subheading: ReactNode
features: FeatureProps[]
cta: {
label: string
@@ -19,7 +19,7 @@ export interface SecuritySectionProps {
export type Story = {
url: string
heading: string
- subheading: string | JSX.Element
+ subheading: ReactNode
}
type FeatureProps = {
diff --git a/apps/www/components/Enterprise/Support.tsx b/apps/www/components/Enterprise/Support.tsx
index 9b6adae1634..cbbfdb19fa0 100644
--- a/apps/www/components/Enterprise/Support.tsx
+++ b/apps/www/components/Enterprise/Support.tsx
@@ -1,14 +1,12 @@
-import React, { FC } from 'react'
-
-import { cn } from 'ui'
import SectionContainer from '~/components/Layouts/SectionContainer'
-
import type { LucideIcon } from 'lucide-react'
+import React, { type FC, type ReactNode } from 'react'
+import { cn } from 'ui'
interface Props {
id: string
- label?: string | JSX.Element
- heading: string | JSX.Element
+ label?: ReactNode
+ heading: ReactNode
features: Feature[]
}
diff --git a/apps/www/components/Enterprise/UseCases.tsx b/apps/www/components/Enterprise/UseCases.tsx
index c7ed09e69bb..057aa4430c8 100644
--- a/apps/www/components/Enterprise/UseCases.tsx
+++ b/apps/www/components/Enterprise/UseCases.tsx
@@ -3,7 +3,7 @@ import 'swiper/css'
import type { LucideIcon } from 'lucide-react'
import Image from 'next/image'
import Link from 'next/link'
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { Swiper, SwiperSlide } from 'swiper/react'
import { TextLink } from 'ui-patterns/TextLink'
@@ -12,8 +12,8 @@ import Panel from '@/components/Panel'
interface Props {
id: string
- label?: string | JSX.Element
- heading?: string | JSX.Element
+ label?: ReactNode
+ heading?: ReactNode
stories?: Story[]
highlights?: Highlight[]
}
@@ -23,7 +23,7 @@ export type Story = {
url: string
target?: '_blank' | string
heading?: string
- subheading?: string | JSX.Element
+ subheading?: ReactNode
}
type Highlight = {
diff --git a/apps/www/components/EnterpriseFormQuotes.tsx b/apps/www/components/EnterpriseFormQuotes.tsx
index 9a765d2b442..96d201bd417 100644
--- a/apps/www/components/EnterpriseFormQuotes.tsx
+++ b/apps/www/components/EnterpriseFormQuotes.tsx
@@ -1,9 +1,9 @@
-import { useEffect, useState } from 'react'
import { AnimatePresence, motion, useAnimation } from 'framer-motion'
+import { useEffect, useState, type ReactNode } from 'react'
import { cn } from 'ui'
interface TabProps {
- label: string | JSX.Element
+ label: ReactNode
isActive: boolean
onClick: VoidFunction
}
@@ -22,9 +22,9 @@ const Tab = ({ isActive, label, onClick }: TabProps) => (
)
interface Tab {
- label: string | JSX.Element
+ label: ReactNode
paragraph?: string
- panel: JSX.Element
+ panel: ReactNode
}
interface Props {
diff --git a/apps/www/components/Modules/Cron/CronSQLSection.tsx b/apps/www/components/Modules/Cron/CronSQLSection.tsx
index 981fa6a6518..8248d60007a 100644
--- a/apps/www/components/Modules/Cron/CronSQLSection.tsx
+++ b/apps/www/components/Modules/Cron/CronSQLSection.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { cn } from 'ui'
import { TextLink } from 'ui-patterns/TextLink'
@@ -15,9 +15,9 @@ select
`
interface Props {
id: string
- label: string | JSX.Element
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ label: ReactNode
+ heading: ReactNode
+ subheading: ReactNode
className?: string
cta?: {
label: string
diff --git a/apps/www/components/Modules/Queues/QueuesAPISection.tsx b/apps/www/components/Modules/Queues/QueuesAPISection.tsx
index 53941912920..84d5a35c51a 100644
--- a/apps/www/components/Modules/Queues/QueuesAPISection.tsx
+++ b/apps/www/components/Modules/Queues/QueuesAPISection.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { cn } from 'ui'
import { TextLink } from 'ui-patterns/TextLink'
@@ -22,9 +22,9 @@ const message = await queues.rpc("pop", {
interface Props {
id: string
- label: string | JSX.Element
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ label: ReactNode
+ heading: ReactNode
+ subheading: ReactNode
className?: string
cta?: {
label: string
diff --git a/apps/www/components/Modules/Queues/QueuesSQLSection.tsx b/apps/www/components/Modules/Queues/QueuesSQLSection.tsx
index f18985bcc82..a173825a773 100644
--- a/apps/www/components/Modules/Queues/QueuesSQLSection.tsx
+++ b/apps/www/components/Modules/Queues/QueuesSQLSection.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { cn } from 'ui'
import { TextLink } from 'ui-patterns/TextLink'
@@ -17,9 +17,9 @@ select * from pgmq.pop('my_special_queue');
`
interface Props {
id: string
- label: string | JSX.Element
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ label: ReactNode
+ heading: ReactNode
+ subheading: ReactNode
className?: string
cta?: {
label: string
diff --git a/apps/www/components/Pricing/PricingAddOnTable.tsx b/apps/www/components/Pricing/PricingAddOnTable.tsx
index c71f402f454..e4ab006252c 100644
--- a/apps/www/components/Pricing/PricingAddOnTable.tsx
+++ b/apps/www/components/Pricing/PricingAddOnTable.tsx
@@ -1,10 +1,11 @@
'use client'
import classNames from 'classnames'
-import { Fragment, useMemo, useState } from 'react'
+import { ChevronUp } from 'lucide-react'
+import { Fragment, useMemo, useState, type ReactNode } from 'react'
import { Collapsible } from 'ui'
+
import { Check } from './PricingIcons'
-import { ChevronUp } from 'lucide-react'
interface PricingAddOnTableProps {
pricing: {
@@ -18,7 +19,7 @@ interface PricingAddOnTableProps {
}[]
}[]
}
- icon: JSX.Element
+ icon: ReactNode
}
const PricingAddOnTable = ({ icon, pricing }: PricingAddOnTableProps) => {
diff --git a/apps/www/components/Sections/ImageParagraphSection.tsx b/apps/www/components/Sections/ImageParagraphSection.tsx
index d4dc082b4a9..248505a8652 100644
--- a/apps/www/components/Sections/ImageParagraphSection.tsx
+++ b/apps/www/components/Sections/ImageParagraphSection.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { cn } from 'ui'
import { TextLink } from 'ui-patterns/TextLink'
@@ -6,9 +6,9 @@ import SectionContainer from '@/components/Layouts/SectionContainer'
interface Props {
id: string
- label: string | JSX.Element
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ label: ReactNode
+ heading: ReactNode
+ subheading: ReactNode
image?: any
className?: string
cta?: {
diff --git a/apps/www/components/Sections/ProductHeader2.tsx b/apps/www/components/Sections/ProductHeader2.tsx
index 64ea726c8ec..3ff5c1b7de2 100644
--- a/apps/www/components/Sections/ProductHeader2.tsx
+++ b/apps/www/components/Sections/ProductHeader2.tsx
@@ -1,16 +1,17 @@
-import React from 'react'
-import { Button, cn } from 'ui'
+import { CTA } from '~/types/common'
import Link from 'next/link'
-import ProductIcon from '../ProductIcon'
+import React, { Children, type ReactNode } from 'react'
+import { Button, cn } from 'ui'
+
import SectionContainer from '../Layouts/SectionContainer'
-import { CTA } from '~/types/common'
+import ProductIcon from '../ProductIcon'
// to do: move types to be global
// then solutions.types.ts should extend this
interface Props {
- label?: string | React.ReactNode
- h1: string | React.ReactNode
- subheader?: string[] | React.ReactNode[]
+ label?: ReactNode
+ h1: ReactNode
+ subheader?: ReactNode
icon?: string
title?: string
image?: React.ReactNode
@@ -54,7 +55,7 @@ const ProductHeader = ({ footerPosition = 'left', ...props }: Props) => (
</h1>
{props.subheader && (
<div className="">
- {props.subheader.map((subheader, i) => {
+ {Children.map(props.subheader, (subheader, i) => {
return (
<p className="p lg:text-lg max-w-lg lg:max-w-none" key={i}>
{subheader}
diff --git a/apps/www/components/Sections/SingleQuote.tsx b/apps/www/components/Sections/SingleQuote.tsx
index 86d11bef765..480be734a0c 100644
--- a/apps/www/components/Sections/SingleQuote.tsx
+++ b/apps/www/components/Sections/SingleQuote.tsx
@@ -1,9 +1,8 @@
+import SectionContainer from '~/components/Layouts/SectionContainer'
import Link from 'next/link'
-import React, { FC } from 'react'
+import React, { type FC, type ReactNode } from 'react'
import { cn } from 'ui'
-import SectionContainer from '~/components/Layouts/SectionContainer'
-
interface Props {
id: string
quote: Quote
@@ -17,9 +16,9 @@ interface Props {
type Quote = {
text: string
author: string
- logo?: string | JSX.Element
+ logo?: ReactNode
role: string
- avatar?: string | JSX.Element
+ avatar?: ReactNode
link?: string
}
diff --git a/apps/www/components/Sections/TimedAccordionSection.tsx b/apps/www/components/Sections/TimedAccordionSection.tsx
index 850abc65d63..01e49d3910f 100644
--- a/apps/www/components/Sections/TimedAccordionSection.tsx
+++ b/apps/www/components/Sections/TimedAccordionSection.tsx
@@ -1,10 +1,10 @@
import 'swiper/css'
-import React, { useState, useEffect, useRef } from 'react'
-import { LazyMotion, domAnimation, m, useAnimation, useInView } from 'framer-motion'
-import { cn } from 'ui'
-import { Swiper, SwiperSlide } from 'swiper/react'
import { useBreakpoint } from 'common'
+import { domAnimation, LazyMotion, m, useAnimation, useInView } from 'framer-motion'
+import React, { useEffect, useRef, useState, type ReactNode } from 'react'
+import { Swiper, SwiperSlide } from 'swiper/react'
+import { cn } from 'ui'
interface TabProps {
label: string | React.ReactNode
@@ -66,9 +66,9 @@ const Tab = ({ isActive, label, paragraph, onClick, progress, intervalDuration }
}
interface Tab {
- label: string | React.ReactNode
- paragraph?: string | React.ReactNode
- panel?: JSX.Element
+ label: ReactNode
+ paragraph?: ReactNode
+ panel?: ReactNode
code?: string
}
diff --git a/apps/www/components/Sections/TimedTabsSection.tsx b/apps/www/components/Sections/TimedTabsSection.tsx
index 837bc073f46..6f8d50f3da4 100644
--- a/apps/www/components/Sections/TimedTabsSection.tsx
+++ b/apps/www/components/Sections/TimedTabsSection.tsx
@@ -1,14 +1,14 @@
import 'swiper/css'
+import CodeBlock from '~/components/CodeBlock/CodeBlock'
+import SectionContainer from '~/components/Layouts/SectionContainer'
import { AnimatePresence, motion, useAnimation } from 'framer-motion'
+import { ArrowUpRight } from 'lucide-react'
import Image from 'next/image'
import Link from 'next/link'
-import { ReactNode, useEffect, useState } from 'react'
+import { useEffect, useState, type ReactNode } from 'react'
import { Swiper, SwiperSlide } from 'swiper/react'
import { Button } from 'ui'
-import CodeBlock from '~/components/CodeBlock/CodeBlock'
-import SectionContainer from '~/components/Layouts/SectionContainer'
-import { ArrowUpRight } from 'lucide-react'
interface TabProps {
label: string
@@ -58,13 +58,13 @@ const Tab = ({ isActive, label, paragraph, onClick, progress, intervalDuration }
interface Tab {
label: string
paragraph?: string
- panel?: JSX.Element
+ panel?: ReactNode
colabUrl: string
code?: string
}
interface Props {
- title: string | ReactNode
+ title: ReactNode
paragraph: string
cta?: {
label?: string
diff --git a/apps/www/components/Solutions/ResultsSection.tsx b/apps/www/components/Solutions/ResultsSection.tsx
index 1681cf75062..5fc454b9e20 100644
--- a/apps/www/components/Solutions/ResultsSection.tsx
+++ b/apps/www/components/Solutions/ResultsSection.tsx
@@ -1,12 +1,11 @@
-import React, { FC } from 'react'
-
import SectionContainer from '~/components/Layouts/SectionContainer'
import UsersGrowthChart from '~/components/UsersGrowthChart'
+import React, { type FC, type ReactNode } from 'react'
export interface ResultsSectionProps {
id: string
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
highlights: Highlight[]
}
diff --git a/apps/www/components/Solutions/Videos.tsx b/apps/www/components/Solutions/Videos.tsx
index 8ab98a0b2b5..bacb1991678 100644
--- a/apps/www/components/Solutions/Videos.tsx
+++ b/apps/www/components/Solutions/Videos.tsx
@@ -1,13 +1,13 @@
-import React, { FC } from 'react'
-
import SectionContainer from '~/components/Layouts/SectionContainer'
-import Panel from '../Panel'
import type { Testimonials } from '~/data/solutions/solutions.utils'
+import React, { type FC, type ReactNode } from 'react'
+
+import Panel from '../Panel'
export type Story = {
url: string
heading: string
- subheading: string | JSX.Element
+ subheading: ReactNode
}
const EnterpriseSecurity: FC<Testimonials> = (props) => {
diff --git a/apps/www/components/Supasquad/PerfectTiming.tsx b/apps/www/components/Supasquad/PerfectTiming.tsx
index 5f2ebba74c0..f0c591ac576 100644
--- a/apps/www/components/Supasquad/PerfectTiming.tsx
+++ b/apps/www/components/Supasquad/PerfectTiming.tsx
@@ -1,12 +1,11 @@
-import React, { FC } from 'react'
-
import SectionContainer from '~/components/Layouts/SectionContainer'
import UsersGrowthChart from '~/components/UsersGrowthChart'
+import React, { type FC, type ReactNode } from 'react'
export interface PerfectTimingProps {
id: string
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
highlights: Highlight[]
}
diff --git a/apps/www/data/MainProducts.tsx b/apps/www/data/MainProducts.tsx
index 9a05d1cac67..1298024f5ac 100644
--- a/apps/www/data/MainProducts.tsx
+++ b/apps/www/data/MainProducts.tsx
@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react'
import { products } from 'shared-data'
import { PRODUCT_NAMES, PRODUCT_SHORTNAMES } from 'shared-data/products'
@@ -5,7 +6,7 @@ export type ProductType = {
[key: string]: {
name: string
icon: string
- description: string | JSX.Element
+ description: ReactNode
description_short: string
label: string
url: string
diff --git a/apps/www/data/open-source/contributing/supasquad.utils.tsx b/apps/www/data/open-source/contributing/supasquad.utils.tsx
index 57b883f6201..ba2329c4f6a 100644
--- a/apps/www/data/open-source/contributing/supasquad.utils.tsx
+++ b/apps/www/data/open-source/contributing/supasquad.utils.tsx
@@ -1,7 +1,7 @@
import { useBreakpoint } from 'common'
import { LucideIcon } from 'lucide-react'
import Link from 'next/link'
-import type { ComponentType, SVGProps } from 'react'
+import type { ComponentType, ReactNode, SVGProps } from 'react'
import { cn } from 'ui'
import z from 'zod'
@@ -43,9 +43,9 @@ export interface Metadata {
export interface HeroSection {
id: string
title: string
- h1: JSX.Element
- subheader: JSX.Element[]
- image: JSX.Element
+ h1: ReactNode
+ subheader: ReactNode
+ image: ReactNode
className?: string
sectionContainerClassName?: string
icon?: string
@@ -66,7 +66,7 @@ export interface Quote {
icon?: string
author: string
authorTitle?: string
- quote: JSX.Element
+ quote: ReactNode
avatar: string
}
@@ -77,8 +77,8 @@ export interface Quotes {
export interface Highlight {
icon?: IconType
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
url?: string
}
@@ -86,16 +86,16 @@ export interface Feature {
id?: string
icon?: string
iconNoStroke?: boolean
- heading: string | JSX.Element
- subheading: string | JSX.Element
- img?: JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
+ img?: ReactNode
}
export interface FeaturesSection {
id: string
label?: string
- heading: JSX.Element
- subheading?: string | JSX.Element
+ heading: ReactNode
+ subheading?: ReactNode
features: Feature[]
className?: string
// {
@@ -106,7 +106,7 @@ export interface FeaturesSection {
export interface Testimonials {
id: string
label: string
- heading: JSX.Element
+ heading: ReactNode
videos: {
[key: string]: {
url: string
@@ -117,7 +117,7 @@ export interface Testimonials {
export interface CTASection {
id: string
label: string
- heading: JSX.Element | string
+ heading: ReactNode
subheading: string
cta: {
label: string
diff --git a/apps/www/data/solutions/innovation-teams.tsx b/apps/www/data/solutions/innovation-teams.tsx
index 79dd69b5128..8d8caba0a47 100644
--- a/apps/www/data/solutions/innovation-teams.tsx
+++ b/apps/www/data/solutions/innovation-teams.tsx
@@ -18,6 +18,7 @@ import {
UserX,
} from 'lucide-react'
import dynamic from 'next/dynamic'
+import type { ReactNode } from 'react'
import { PRODUCT_SHORTNAMES } from 'shared-data/products'
import { Image } from 'ui-patterns/Image'
@@ -45,9 +46,9 @@ interface Quote {
text: string
author: string
role: string
- logo?: string | JSX.Element
+ logo?: ReactNode
link?: string
- avatar?: string | JSX.Element
+ avatar?: ReactNode
}
interface AIBuilderEcosystemSection {
@@ -918,7 +919,7 @@ const data: () => {
'## Overview of implementing Supabase Auth SSR\n1. Install @supabase/supabase-js and...',
code: `1. Install @supabase/supabase-js and @supabase/ssr packages.
2. Set up environment variables.
-3. Write two utility functions with \u0060createClient\u0060 functions to create a browser client and a server client.
+3. Write two utility functions with \u0060createClient\u0060 functions to create a browser client and a server client.
4. Hook up middleware to refresh auth tokens
`,
language: 'markdown',
diff --git a/apps/www/data/solutions/solutions.utils.tsx b/apps/www/data/solutions/solutions.utils.tsx
index aef0a9978cf..96fba41eaaa 100644
--- a/apps/www/data/solutions/solutions.utils.tsx
+++ b/apps/www/data/solutions/solutions.utils.tsx
@@ -1,7 +1,7 @@
import { useBreakpoint } from 'common'
import { LucideIcon } from 'lucide-react'
import Link from 'next/link'
-import type { ComponentType, SVGProps } from 'react'
+import type { ComponentType, ReactNode, SVGProps } from 'react'
import { cn } from 'ui'
export type HeroIcon = ComponentType<SVGProps<SVGSVGElement>>
@@ -15,9 +15,9 @@ export interface Metadata {
export interface HeroSection {
id: string
title: string
- h1: JSX.Element
- subheader: JSX.Element[]
- image: JSX.Element | undefined
+ h1: ReactNode
+ subheader: ReactNode
+ image: ReactNode
className?: string
sectionContainerClassName?: string
icon?: string
@@ -30,7 +30,7 @@ export interface HeroSection {
name: string
image: string
}[]
- footer?: React.ReactNode
+ footer?: ReactNode
footerPosition?: 'left' | 'right' | 'bottom'
}
@@ -38,7 +38,7 @@ export interface Quote {
icon?: string
author: string
authorTitle?: string
- quote: JSX.Element
+ quote: ReactNode
avatar: string
}
@@ -49,8 +49,8 @@ export interface Quotes {
export interface Highlight {
icon?: IconType
- heading: string | JSX.Element
- subheading: string | JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
url?: string
}
@@ -58,15 +58,15 @@ export interface Feature {
id?: string
icon?: IconType | string
iconNoStroke?: boolean
- heading: string | JSX.Element
- subheading: string | JSX.Element
- img?: JSX.Element
+ heading: ReactNode
+ subheading: ReactNode
+ img?: ReactNode
}
export interface FeaturesSection {
id: string
label?: string
- heading: string | JSX.Element
+ heading: ReactNode
subheading?: string
features: Feature[]
// {
@@ -77,7 +77,7 @@ export interface FeaturesSection {
export interface Testimonials {
id: string
label: string
- heading: JSX.Element
+ heading: ReactNode
videos: {
[key: string]: {
url: string
@@ -88,7 +88,7 @@ export interface Testimonials {
export interface CTASection {
id: string
label: string
- heading: JSX.Element | string
+ heading: ReactNode | string
subheading: string
cta: {
label: string
@@ -99,13 +99,13 @@ export interface CTASection {
export interface FrameworkLinkProps {
name: string
- icon: string | React.ReactNode
+ icon: string | ReactNode
docs: string
}
export interface PostGridProps {
- header: React.ReactNode
- subheader: React.ReactNode
+ header: ReactNode
+ subheader: ReactNode
}
export const FrameworkLink = ({ framework }: { framework: FrameworkLinkProps }) => {
diff --git a/apps/www/pages/assistant.tsx b/apps/www/pages/assistant.tsx
index 4f99358f92d..6ce98219e2c 100644
--- a/apps/www/pages/assistant.tsx
+++ b/apps/www/pages/assistant.tsx
@@ -1,14 +1,15 @@
+import DotGrid from '~/components/AIDemo/DotGrid'
+import { AIDemoPanel } from '~/components/AIDemo/Panel'
+import { SqlSnippet } from '~/components/AIDemo/SqlSnippet'
import { useIsLoggedIn, useIsUserLoading } from 'common'
import { motion } from 'framer-motion'
import { NextSeo } from 'next-seo'
import dynamic from 'next/dynamic'
import Link from 'next/link'
import { useRouter } from 'next/router'
-import { useEffect, useState } from 'react'
+import { useEffect, useState, type ReactNode } from 'react'
import { Button } from 'ui'
-import DotGrid from '~/components/AIDemo/DotGrid'
-import { AIDemoPanel } from '~/components/AIDemo/Panel'
-import { SqlSnippet } from '~/components/AIDemo/SqlSnippet'
+
import { EASE_OUT } from '../lib/animations'
const DefaultLayout = dynamic(() => import('~/components/Layouts/Default'))
@@ -17,9 +18,9 @@ const SectionContainer = dynamic(() => import('~/components/Layouts/SectionConta
interface Message {
id: string
role: 'user' | 'assistant'
- content: string | JSX.Element
+ content: ReactNode
createdAt: Date
- render?: JSX.Element
+ render?: ReactNode
}
const welcomeMessages = [
@@ -192,14 +193,14 @@ RETURNS INTEGER AS $$
DECLARE
total_points INTEGER;
BEGIN
- SELECT
+ SELECT
COALESCE(
(SELECT COUNT(*) * 10 FROM posts WHERE author_id = user_id) + -- 10 points per post
(SELECT COUNT(*) * 5 FROM comments WHERE user_id = user_id) + -- 5 points per comment
(SELECT COUNT(*) * 2 FROM post_likes WHERE user_id = user_id), -- 2 points per like
0
) INTO total_points;
-
+
RETURN total_points;
END;
$$ LANGUAGE plpgsql;`}
@@ -236,16 +237,16 @@ FOR SELECT
USING (
team_id IN (
-- User can see members of teams they belong to
- SELECT team_id
- FROM team_members
+ SELECT team_id
+ FROM team_members
WHERE user_id = auth.uid()
)
- OR
+ OR
-- Team admins can see all members
EXISTS (
- SELECT 1
- FROM team_admins
- WHERE user_id = auth.uid()
+ SELECT 1
+ FROM team_admins
+ WHERE user_id = auth.uid()
AND team_id = team_members.team_id
)
);`}
@@ -272,7 +273,7 @@ USING (
<SqlSnippet
id="projects-sql"
title="Get All Projects SQL"
- sql={`SELECT
+ sql={`SELECT
p.id,
p.name,
p.description,