WIP bump react 18

vazco · Jul 26, 2024 · c0750e5 · c0750e5
1 parent a5c1841
commit c0750e5
Show file tree

Hide file tree

Showing 17 changed files with 32,831 additions and 19,795 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,9 +17,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@ant-design/icons": "4.4.0",
-    "@docusaurus/core": "2.1.0",
-    "@docusaurus/preset-classic": "2.1.0",
+    "@ant-design/icons": "5.4.0",
+    "@docusaurus/core": "3.4.0",
+    "@docusaurus/preset-classic": "3.4.0",
     "@emotion/react": "11.7.1",
     "@emotion/styled": "11.6.0",
     "@mui/material": "5.4.1",
@@ -31,12 +31,13 @@
     "@types/jest": "26.0.20",
     "@types/lodash": "4.14.168",
     "@types/lz-string": "1.3.34",
-    "@types/react": "17.0.39",
-    "@types/react-dom": "17.0.11",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
     "@types/simpl-schema": "1.12.2",
     "@types/warning": "3.0.0",
+    "@types/ws": "8.5.11",
     "ajv": "8.0.5",
-    "antd": "4.10.3",
+    "antd": "4.24.16",
     "classnames": "^2.0.0",
     "core-js": "3.8.3",
     "csstype": "3.0.10",
@@ -52,8 +53,8 @@
     "lz-string": "1.4.4",
     "parcel": "2.9.2",
     "raw-loader": "4.0.2",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-feather": "2.0.9",
     "react-frame-component": "4.1.3",
     "react-test-renderer": "17.0.2",

diff --git a/packages/uniforms-antd/src/NumField.tsx b/packages/uniforms-antd/src/NumField.tsx
@@ -9,7 +9,7 @@ export type NumFieldProps = FieldProps<
   // FIXME: Why `onReset` fails with `wrapField`?
   Omit<InputNumberProps, 'onReset'>,
   // FIXME: `unknown` ref; see https://github.com/vazco/uniforms/discussions/1230#discussioncomment-5158439
-  { decimal?: boolean; inputRef?: Ref<unknown> }
+  { decimal?: boolean; inputRef?: Ref<HTMLInputElement> }
 >;
 
 function Num(props: NumFieldProps) {

diff --git a/packages/uniforms-antd/src/TextField.tsx b/packages/uniforms-antd/src/TextField.tsx
@@ -1,4 +1,4 @@
-import Input, { InputProps } from 'antd/lib/input';
+import Input, { InputProps, InputRef } from 'antd/lib/input';
 import React, { Ref } from 'react';
 import { FieldProps, connectField, filterDOMProps } from 'uniforms';
 
@@ -7,7 +7,7 @@ import wrapField from './wrapField';
 export type TextFieldProps = FieldProps<
   string,
   Omit<InputProps, 'onReset'>,
-  { inputRef?: Ref<Input> }
+  { inputRef?: Ref<InputRef> }
 >;
 
 function Text(props: TextFieldProps) {

diff --git a/packages/uniforms/__suites__/render-zod.tsx b/packages/uniforms/__suites__/render-zod.tsx
@@ -16,6 +16,7 @@ export function renderWithZod<Props, Schema extends ZodObject<ZodRawShape>>({
     wrapper({ children }) {
       const bridge = new ZodBridge({ schema });
       return (
+        // @ts-expect-error
         <AutoForm {...autoFormProps} schema={bridge} children={children} />
       );
     },

diff --git a/packages/uniforms/__suites__/render.tsx b/packages/uniforms/__suites__/render.tsx
@@ -23,6 +23,7 @@ export function render<P, Model extends UnknownObject>(
             model={model}
             schema={bridge}
           >
+            {/* @ts-expect-error */}
             {children}
           </AutoForm>
         );

diff --git a/packages/uniforms/src/BaseForm.tsx b/packages/uniforms/src/BaseForm.tsx
@@ -2,7 +2,7 @@ import clone from 'lodash/clone';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
 import setWith from 'lodash/setWith';
-import React, { Component, SyntheticEvent } from 'react';
+import React, { Component, SyntheticEvent, ReactNode } from 'react';
 
 import { Bridge } from './Bridge';
 import { changedKeys } from './changedKeys';
@@ -29,6 +29,7 @@ export type BaseFormProps<Model extends UnknownObject> = {
   readOnly?: boolean;
   schema: Bridge;
   showInlineError?: boolean;
+  children?: ReactNode;
 };
 
 export type BaseFormState<Model extends UnknownObject> = {