fix: support for react 19

kubb-labs · Dec 14, 2024 · 082e6d3 · 082e6d3
1 parent 12f4206
commit 082e6d3
Show file tree

Hide file tree

Showing 22 changed files with 1,815 additions and 2,362 deletions.
diff --git a/packages/plugin-client/src/clients/fetch.ts b/packages/plugin-client/src/clients/fetch.ts
@@ -1,5 +1,5 @@
 /**
- * Subset of AxiosRequestConfig
+ * Subset of FetchRequestConfig
  */
 export type RequestConfig<TData = unknown> = {
   baseURL?: string
@@ -12,7 +12,7 @@ export type RequestConfig<TData = unknown> = {
   headers?: [string, string][] | Record<string, string>
 }
 /**
- * Subset of AxiosResponse
+ * Subset of FetchResponse
  */
 export type ResponseConfig<TData = unknown> = {
   data: TData
@@ -22,7 +22,7 @@ export type ResponseConfig<TData = unknown> = {
 }
 
 export const fetchClient = async <TData, TError = unknown, TVariables = unknown>(config: RequestConfig<TVariables>): Promise<ResponseConfig<TData>> => {
-  const response = await fetch('https://example.org/post', {
+  const response = await fetch(`${config.baseURL}${config.url}`, {
     method: config.method.toUpperCase(),
     body: JSON.stringify(config.data),
     signal: config.signal,

diff --git a/packages/plugin-client/src/components/Client.tsx b/packages/plugin-client/src/components/Client.tsx
@@ -4,7 +4,6 @@ import { type Operation, isOptional } from '@kubb/oas'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
 import { File, Function, FunctionParams } from '@kubb/react'
-import type { KubbNode } from '@kubb/react/types'
 import type { PluginClient } from '../types.ts'
 
 type Props = {
@@ -113,7 +112,7 @@ export function Client({
   paramsCasing,
   pathParamsType,
   operation,
-}: Props): KubbNode {
+}: Props) {
   const path = new URLPath(operation.path, { casing: paramsCasing })
   const contentType = operation.getContentType()
   const isFormData = contentType === 'multipart/form-data'

diff --git a/packages/plugin-faker/src/components/Faker.tsx b/packages/plugin-faker/src/components/Faker.tsx
@@ -18,7 +18,7 @@ type Props = {
   canOverride: boolean
 }
 
-export function Faker({ tree, description, name, typeName, seed, regexGenerator, canOverride, mapper, dateParser }: Props): KubbNode {
+export function Faker({ tree, description, name, typeName, seed, regexGenerator, canOverride, mapper, dateParser }: Props) {
   const fakerText = parserFaker.joinItems(
     tree
       .map((schema, _index, siblings) =>

diff --git a/packages/plugin-msw/package.json b/packages/plugin-msw/package.json
@@ -96,8 +96,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-oas/package.json b/packages/plugin-oas/package.json
@@ -95,8 +95,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-oas/src/components/Oas.tsx b/packages/plugin-oas/src/components/Oas.tsx
@@ -28,7 +28,7 @@ type OasContextProps = {
 
 const OasContext = createContext<OasContextProps>({})
 
-export function Oas({ oas, children, operations, generator }: Props): KubbNode {
+export function Oas({ oas, children, operations, generator }: Props) {
   return <OasContext.Provider value={{ oas, generator, operations }}>{children}</OasContext.Provider>
 }
 

diff --git a/packages/plugin-oas/src/components/Operation.tsx b/packages/plugin-oas/src/components/Operation.tsx
@@ -14,7 +14,7 @@ type OperationContextProps = {
 
 const OperationContext = createContext<OperationContextProps>({})
 
-export function Operation({ operation, children }: Props): KubbNode {
+export function Operation({ operation, children }: Props) {
   return <OperationContext.Provider value={{ operation }}>{children}</OperationContext.Provider>
 }
 

diff --git a/packages/plugin-oas/src/components/Schema.tsx b/packages/plugin-oas/src/components/Schema.tsx
@@ -1,7 +1,7 @@
 import { createContext } from '@kubb/react'
 
 import type { SchemaObject } from '@kubb/oas'
-import type { KubbNode } from '@kubb/react/types'
+import type { Key, KubbNode } from '@kubb/react/types'
 import type { Schema as SchemaType } from '../SchemaMapper.ts'
 
 export type SchemaContextProps = {
@@ -11,6 +11,7 @@ export type SchemaContextProps = {
 }
 
 type Props = {
+  key?: Key
   name: string
   value?: SchemaObject
   tree?: Array<SchemaType>
@@ -22,7 +23,7 @@ const SchemaContext = createContext<SchemaContextProps>({
   tree: [],
 })
 
-export function Schema({ name, value, tree = [], children }: Props): KubbNode {
+export function Schema({ name, value, tree = [], children }: Props) {
   return <SchemaContext.Provider value={{ name, schema: value, tree }}>{children}</SchemaContext.Provider>
 }
 

diff --git a/packages/plugin-react-query/package.json b/packages/plugin-react-query/package.json
@@ -85,8 +85,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-redoc/package.json b/packages/plugin-redoc/package.json
@@ -57,16 +57,16 @@
     "@kubb/plugin-oas": "workspace:*",
     "handlebars": "^4.7.8",
     "mobx": "^6.13.5",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "catalog:",
+    "react-dom": "catalog:",
     "redoc": "^2.2.0",
     "styled-components": "^6.1.13"
   },
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "@types/react-dom": "^18.3.5",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-redoc/src/redoc.tsx b/packages/plugin-redoc/src/redoc.tsx
@@ -2,9 +2,10 @@ import fs from 'node:fs'
 import path from 'node:path'
 import type { OasTypes } from '@kubb/oas'
 import pkg from 'handlebars'
+import React from 'react'
 import { renderToString } from 'react-dom/server'
-import { ServerStyleSheet } from 'styled-components'
 import redoc from 'redoc'
+import { ServerStyleSheet } from 'styled-components'
 
 type BuildDocsOptions = {
   title?: string
@@ -40,7 +41,9 @@ export async function getPageHTML(api: OasTypes.OASDocument, { title, disableGoo
     error(...args)
   }
 
-  const html = renderToString(sheet.collectStyles(<Redoc store={store} />))
+  const App = Redoc as any
+
+  const html = renderToString(sheet.collectStyles(<App store={store} />))
   const state = await store.toJS()
   const css = sheet.getStyleTags()
 

diff --git a/packages/plugin-solid-query/package.json b/packages/plugin-solid-query/package.json
@@ -85,8 +85,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-svelte-query/package.json b/packages/plugin-svelte-query/package.json
@@ -85,8 +85,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-swr/package.json b/packages/plugin-swr/package.json
@@ -87,8 +87,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-ts/package.json b/packages/plugin-ts/package.json
@@ -79,8 +79,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-ts/src/components/OasType.tsx b/packages/plugin-ts/src/components/OasType.tsx
@@ -1,7 +1,7 @@
 import { File, Type } from '@kubb/react'
 
 import type { OasTypes } from '@kubb/oas'
-import type { ReactNode } from 'react'
+import type { KubbNode } from '@kubb/react/types'
 
 type Props = {
   /**
@@ -12,7 +12,7 @@ type Props = {
   api: OasTypes.OASDocument
 }
 
-export function OasType({ name, typeName, api }: Props): ReactNode {
+export function OasType({ name, typeName, api }: Props) {
   return (
     <>
       <File.Source name={name} isExportable isIndexable>

diff --git a/packages/plugin-ts/src/components/Type.tsx b/packages/plugin-ts/src/components/Type.tsx
@@ -119,7 +119,8 @@ export function Type({ name, typedName, tree, keysToOmit, optionalType, syntaxTy
   return (
     <Fragment>
       {enums.map(({ name, nameNode, typeName, typeNode }, index) => (
-        <Fragment key={[name, nameNode].join('-')}>
+        // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+        <Fragment>
           {nameNode && (
             <File.Source name={name} isExportable isIndexable>
               {print([nameNode])}

diff --git a/packages/plugin-vue-query/package.json b/packages/plugin-vue-query/package.json
@@ -85,8 +85,8 @@
   "devDependencies": {
     "@kubb/config-ts": "workspace:*",
     "@kubb/config-tsup": "workspace:*",
-    "@types/react": "^18.3.16",
-    "react": "^18.3.1",
+    "@types/react": "catalog:",
+    "react": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:"
   },

diff --git a/packages/plugin-zod/src/components/Operations.tsx b/packages/plugin-zod/src/components/Operations.tsx
@@ -10,7 +10,7 @@ type Props = {
   operations: Array<{ operation: Operation; data: SchemaNames }>
 }
 
-export function Operations({ name, operations }: Props): KubbNode {
+export function Operations({ name, operations }: Props) {
   const operationsJSON = operations.reduce(
     (prev, acc) => {
       prev[`"${acc.operation.getOperationId()}"`] = acc.data

diff --git a/packages/plugin-zod/src/components/Zod.tsx b/packages/plugin-zod/src/components/Zod.tsx
@@ -17,7 +17,7 @@ type Props = {
   keysToOmit?: string[]
 }
 
-export function Zod({ name, typeName, tree, inferTypeName, mapper, coercion, keysToOmit, description }: Props): KubbNode {
+export function Zod({ name, typeName, tree, inferTypeName, mapper, coercion, keysToOmit, description }: Props) {
   const hasTuple = tree.some((item) => isKeyword(item, schemaKeywords.tuple))
 
   const output = parserZod