Merge branch 'master' into nextra

# Conflicts: # package-lock.json
vazco · Sep 27, 2024 · 0569bc9 · 0569bc9
2 parents ed41a5b + 2b680f2
commit 0569bc9
Show file tree

Hide file tree

Showing 58 changed files with 12,880 additions and 13,605 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     steps:
       - name: Checkout
         uses: actions/[email protected]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,19 +21,21 @@
     "@testing-library/react": "12.1.5",
     "@testing-library/user-event": "14.4.3",
     "@types/jest": "26.0.20",
-    "eslint-config-vazco": "6.2.0",
+    "@types/node": "18.19.50",
+    "eslint-config-vazco": "7.4.0",
     "eslint-import-resolver-alias": "1.1.2",
     "eslint-import-resolver-typescript": "2.3.0",
     "husky": "8.0.1",
-    "jest": "27.0.6",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "lint-staged": "13.0.3",
     "rimraf": "3.0.2",
     "stylelint": "13.8.0",
     "stylelint-config-prettier": "8.0.2",
     "stylelint-prettier": "1.1.2",
-    "ts-jest": "27.0.3",
+    "ts-jest": "29.2.5",
     "turbo": "2.1.1",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "packageManager": "[email protected]",
   "workspaces": [

diff --git a/packages/uniforms-antd/__tests__/DateField.tsx b/packages/uniforms-antd/__tests__/DateField.tsx
@@ -4,8 +4,8 @@ import userEvent, {
 } from '@testing-library/user-event';
 import moment from 'moment';
 import React from 'react';
-import { DateField } from 'uniforms-antd';
 import { renderWithZod } from 'uniforms/__suites__';
+import { DateField } from 'uniforms-antd';
 import { z } from 'zod';
 
 const getClosestInput = (text: string) =>

diff --git a/packages/uniforms-antd/__tests__/SelectField.tsx b/packages/uniforms-antd/__tests__/SelectField.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, screen } from '@testing-library/react';
 import React from 'react';
-import { SelectField } from 'uniforms-antd';
 import { renderWithZod } from 'uniforms/__suites__';
+import { SelectField } from 'uniforms-antd';
 import { z } from 'zod';
 
 test('<SelectField> - renders a select which correctly reacts on change (array)', () => {

diff --git a/packages/uniforms-antd/__tests__/index.ts b/packages/uniforms-antd/__tests__/index.ts
@@ -1,5 +1,5 @@
-import * as theme from 'uniforms-antd';
 import * as suites from 'uniforms/__suites__';
+import * as theme from 'uniforms-antd';
 
 it('exports everything', () => {
   expect(theme).toEqual({

diff --git a/packages/uniforms-antd/__tests__/wrapField.tsx b/packages/uniforms-antd/__tests__/wrapField.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import React from 'react';
-import { wrapField } from 'uniforms-antd';
 import { renderWithZod } from 'uniforms/__suites__';
+import { wrapField } from 'uniforms-antd';
 import { z } from 'zod';
 
 describe('wrapField tests', () => {

diff --git a/packages/uniforms-antd/package.json b/packages/uniforms-antd/package.json
@@ -48,7 +48,7 @@
     "@types/lodash": "4.17.5",
     "@types/react": "17.0.39",
     "tslib": "2.2.0",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build:cjs": "tsc --build tsconfig.cjs.json",

diff --git a/packages/uniforms-antd/src/BaseForm.tsx b/packages/uniforms-antd/src/BaseForm.tsx
@@ -16,7 +16,11 @@ function AntD(parent: any) {
 
       return {
         ...props,
-        className: classnames('ant-form', 'ant-form-' + layout, className),
+        className: classnames(
+          'ant-form',
+          'ant-form-' + layout,
+          className as string,
+        ),
       };
     }
   }

diff --git a/packages/uniforms-antd/src/BoolField.tsx b/packages/uniforms-antd/src/BoolField.tsx
@@ -14,6 +14,7 @@ export type BoolFieldProps = FieldProps<
   {
     checkbox?: boolean;
     checkedChildren?: ReactNode;
+    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
     inputRef?: Ref<typeof Checkbox | typeof Switch | any>;
     unCheckedChildren?: ReactNode;
   }

diff --git a/packages/uniforms-antd/src/ListField.tsx b/packages/uniforms-antd/src/ListField.tsx
@@ -5,6 +5,7 @@ import React, {
   Children,
   cloneElement,
   isValidElement,
+  ReactElement,
   ReactNode,
 } from 'react';
 import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
@@ -79,7 +80,7 @@ function List({
       {value?.map((item, itemIndex) =>
         Children.map(children, (child, childIndex) =>
           isValidElement(child)
-            ? cloneElement(child, {
+            ? cloneElement(child as ReactElement, {
                 key: `${itemIndex}-${childIndex}`,
                 name: child.props.name?.replace('$', '' + itemIndex),
                 labelCol,

diff --git a/packages/uniforms-antd/src/RadioField.tsx b/packages/uniforms-antd/src/RadioField.tsx
@@ -28,7 +28,7 @@ function Radio(props: RadioFieldProps) {
       name={props.name}
       onChange={event => {
         if (!props.readOnly) {
-          props.onChange(event.target.value);
+          props.onChange(event.target.value as string | undefined);
         }
       }}
       value={props.value ?? ''}

diff --git a/packages/uniforms-antd/src/SelectField.tsx b/packages/uniforms-antd/src/SelectField.tsx
@@ -55,6 +55,7 @@ function Select(props: SelectFieldProps) {
             if (!props.readOnly) {
               props.onChange(
                 // FIXME: Argument type depends on `props.fieldType`.
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 props.fieldType === Array
                   ? eventOrValue
                   : eventOrValue.target.value,
@@ -74,7 +75,7 @@ function Select(props: SelectFieldProps) {
         disabled={props.disabled}
         mode={props.fieldType === Array ? 'multiple' : undefined}
         name={props.name}
-        onChange={value => {
+        onChange={(value: SelectFieldValue) => {
           if (!props.readOnly) {
             props.onChange(value);
           }

diff --git a/packages/uniforms-bootstrap4/__tests__/index.ts b/packages/uniforms-bootstrap4/__tests__/index.ts
@@ -1,5 +1,5 @@
-import * as theme from 'uniforms-bootstrap4';
 import * as suites from 'uniforms/__suites__';
+import * as theme from 'uniforms-bootstrap4';
 
 it('exports everything', () => {
   expect(theme).toEqual({

diff --git a/packages/uniforms-bootstrap4/__tests__/wrapField.tsx b/packages/uniforms-bootstrap4/__tests__/wrapField.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import React from 'react';
-import { wrapField } from 'uniforms-bootstrap4';
 import { renderWithZod } from 'uniforms/__suites__';
+import { wrapField } from 'uniforms-bootstrap4';
 import { z } from 'zod';
 
 describe('wrapField tests', () => {

diff --git a/packages/uniforms-bootstrap4/package.json b/packages/uniforms-bootstrap4/package.json
@@ -42,7 +42,7 @@
     "@types/lodash": "4.17.5",
     "@types/react": "17.0.39",
     "tslib": "2.2.0",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build:cjs": "tsc --build tsconfig.cjs.json",

diff --git a/packages/uniforms-bootstrap4/src/BaseForm.tsx b/packages/uniforms-bootstrap4/src/BaseForm.tsx
@@ -18,7 +18,7 @@ function Bootstrap4(parent: any) {
 
       return {
         ...omit(props, ['grid']),
-        className: classnames('form', { error }, props.className),
+        className: classnames('form', { error }, props.className as string),
       };
     }
   }

diff --git a/packages/uniforms-bootstrap4/src/ListField.tsx b/packages/uniforms-bootstrap4/src/ListField.tsx
@@ -3,6 +3,7 @@ import React, {
   Children,
   cloneElement,
   isValidElement,
+  ReactElement,
   ReactNode,
 } from 'react';
 import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
@@ -54,7 +55,7 @@ function List({
         {value?.map((item, itemIndex) =>
           Children.map(children, (child, childIndex) =>
             isValidElement(child)
-              ? cloneElement(child, {
+              ? cloneElement(child as ReactElement, {
                   key: `${itemIndex}-${childIndex}`,
                   name: child.props.name?.replace('$', '' + itemIndex),
                   ...itemProps,

diff --git a/packages/uniforms-bootstrap4/src/SubmitField.tsx b/packages/uniforms-bootstrap4/src/SubmitField.tsx
@@ -2,7 +2,7 @@ import classnames from 'classnames';
 import React, { HTMLProps, Ref } from 'react';
 import { filterDOMProps, Override, useForm } from 'uniforms';
 
-import gridClassName from './gridClassName';
+import gridClassName, { GridSize } from './gridClassName';
 
 export type SubmitFieldProps = Override<
   HTMLProps<HTMLInputElement>,
@@ -24,7 +24,10 @@ function SubmitField({
   ...props
 }: SubmitFieldProps) {
   const { error, state: anyState } = useForm();
-  const state = anyState as unknown as { disabled: boolean; grid: any };
+  const state = anyState as unknown as {
+    disabled: boolean;
+    grid: number | string | Partial<Record<GridSize, number>>;
+  };
   const hasWrap = !!(state.grid || wrapClassName);
 
   const blockInput = (

diff --git a/packages/uniforms-bootstrap4/src/gridClassName.ts b/packages/uniforms-bootstrap4/src/gridClassName.ts
@@ -9,7 +9,7 @@ function gridClassNamePart(
     : `col-${sizeInfix}${12 - value}`;
 }
 
-type GridSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+export type GridSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 const gridOrder = { xs: 1, sm: 2, md: 3, lg: 4, xl: 5 };
 
 function compareSizeClass(a: GridSize, b: GridSize) {
@@ -45,7 +45,7 @@ export default function gridClassName(
       (Object.keys(grid) as GridSize[])
         .sort(compareSizeClass)
         // @ts-expect-error Weird type refinement problem.
-        .map(size => gridClassNamePart(size, grid[size], side))
+        .map(size => gridClassNamePart(size, grid[size] as number, side))
         .join(' ')
     );
   }

diff --git a/packages/uniforms-bootstrap5/__tests__/index.ts b/packages/uniforms-bootstrap5/__tests__/index.ts
@@ -1,5 +1,5 @@
-import * as theme from 'uniforms-bootstrap5';
 import * as suites from 'uniforms/__suites__';
+import * as theme from 'uniforms-bootstrap5';
 
 it('exports everything', () => {
   expect(theme).toEqual({

diff --git a/packages/uniforms-bootstrap5/__tests__/wrapField.tsx b/packages/uniforms-bootstrap5/__tests__/wrapField.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import React from 'react';
-import { wrapField } from 'uniforms-bootstrap5';
 import { renderWithZod } from 'uniforms/__suites__';
+import { wrapField } from 'uniforms-bootstrap5';
 import { z } from 'zod';
 
 describe('wrapField tests', () => {

diff --git a/packages/uniforms-bootstrap5/package.json b/packages/uniforms-bootstrap5/package.json
@@ -42,7 +42,7 @@
     "@types/lodash": "4.17.5",
     "@types/react": "17.0.39",
     "tslib": "2.2.0",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build:cjs": "tsc --build tsconfig.cjs.json",

diff --git a/packages/uniforms-bootstrap5/src/BaseForm.tsx b/packages/uniforms-bootstrap5/src/BaseForm.tsx
@@ -18,7 +18,7 @@ function Bootstrap5(parent: any) {
 
       return {
         ...omit(props, ['grid']),
-        className: classnames({ error }, props.className),
+        className: classnames({ error }, props.className as string),
       };
     }
   }

diff --git a/packages/uniforms-bootstrap5/src/ListField.tsx b/packages/uniforms-bootstrap5/src/ListField.tsx
@@ -3,6 +3,7 @@ import React, {
   Children,
   cloneElement,
   isValidElement,
+  ReactElement,
   ReactNode,
 } from 'react';
 import { connectField, filterDOMProps, HTMLFieldProps } from 'uniforms';
@@ -54,7 +55,7 @@ function List({
         {value?.map((item, itemIndex) =>
           Children.map(children, (child, childIndex) =>
             isValidElement(child)
-              ? cloneElement(child, {
+              ? cloneElement(child as ReactElement, {
                   key: `${itemIndex}-${childIndex}`,
                   name: child.props.name?.replace('$', '' + itemIndex),
                   ...itemProps,

diff --git a/packages/uniforms-bootstrap5/src/SubmitField.tsx b/packages/uniforms-bootstrap5/src/SubmitField.tsx
@@ -1,6 +1,7 @@
 import classnames from 'classnames';
 import React, { HTMLProps, Ref } from 'react';
 import { filterDOMProps, Override, useForm } from 'uniforms';
+import { GridSize } from 'uniforms-bootstrap4/src/gridClassName';
 
 import gridClassName from './gridClassName';
 
@@ -24,7 +25,10 @@ function SubmitField({
   ...props
 }: SubmitFieldProps) {
   const { error, state: anyState } = useForm();
-  const state = anyState as unknown as { disabled: boolean; grid: any };
+  const state = anyState as unknown as {
+    disabled: boolean;
+    grid: string | number | Partial<Record<GridSize, number>> | undefined;
+  };
   const hasWrap = !!(state.grid || wrapClassName);
 
   const blockInput = (

diff --git a/packages/uniforms-bootstrap5/src/gridClassName.ts b/packages/uniforms-bootstrap5/src/gridClassName.ts
@@ -48,7 +48,7 @@ export default function gridClassName(
       (Object.keys(grid) as GridSize[])
         .sort(compareSizeClass)
         // @ts-expect-error Weird type refinement problem.
-        .map(size => gridClassNamePart(size, grid[size], side))
+        .map(size => gridClassNamePart(size, grid[size] as number, side))
         .join(' ')
     );
   }

diff --git a/packages/uniforms-bridge-json-schema/__tests__/JSONSchemaBridge.ts b/packages/uniforms-bridge-json-schema/__tests__/JSONSchemaBridge.ts
@@ -842,9 +842,8 @@ describe('JSONSchemaBridge', () => {
     });
 
     it('works with anyOf for a non-object computed property (properties not defined)', () => {
-      expect(bridge.getProps('nonObjectAnyOf')).toHaveProperty(
+      expect(bridge.getProps('nonObjectAnyOf')).not.toHaveProperty(
         'properties',
-        undefined,
       );
     });
 

diff --git a/packages/uniforms-bridge-json-schema/package.json b/packages/uniforms-bridge-json-schema/package.json
@@ -41,7 +41,7 @@
     "@types/invariant": "2.2.37",
     "@types/lodash": "4.17.5",
     "tslib": "2.2.0",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build:cjs": "tsc --build tsconfig.cjs.json",

diff --git a/packages/uniforms-bridge-json-schema/src/JSONSchemaBridge.ts b/packages/uniforms-bridge-json-schema/src/JSONSchemaBridge.ts
@@ -213,7 +213,10 @@ export default class JSONSchemaBridge extends Bridge {
         partialNames.forEach(partialName => {
           definition[partialName]?.forEach((partialElement: any) => {
             if (!nextFound) {
-              partialElement = resolveRefIfNeeded(partialElement, this.schema);
+              partialElement = resolveRefIfNeeded(
+                partialElement as UnknownObject,
+                this.schema,
+              );
               if (next in partialElement.properties) {
                 definition = partialElement.properties[next];
                 nextFound = true;
@@ -235,7 +238,7 @@ export default class JSONSchemaBridge extends Bridge {
 
       partialNames.forEach(partialName => {
         definition[partialName]?.forEach((partial: any) => {
-          partial = resolveRefIfNeeded(partial, this.schema);
+          partial = resolveRefIfNeeded(partial as UnknownObject, this.schema);
 
           if (partial.required) {
             required.push(...partial.required);
@@ -339,7 +342,9 @@ export default class JSONSchemaBridge extends Bridge {
         }));
       }
     } else if (props.enum) {
-      options = Object.values(props.enum).map(value => ({ value }));
+      options = Object.values(props.enum as Record<string, unknown>).map(
+        value => ({ value }),
+      );
     }
 
     propsToRename.forEach(([key, newKey]) => {
@@ -364,7 +369,9 @@ export default class JSONSchemaBridge extends Bridge {
       this._compiledSchema[name];
 
     if (type === 'object' && properties) {
-      return Object.keys(properties).map(joinName.escape);
+      return Object.keys(properties as Record<string, unknown>).map(
+        joinName.escape,
+      );
     }
 
     return [];

diff --git a/packages/uniforms-bridge-simple-schema-2/package.json b/packages/uniforms-bridge-simple-schema-2/package.json
@@ -45,7 +45,7 @@
     "@types/lodash": "4.17.5",
     "@types/simpl-schema": "1.12.7",
     "tslib": "2.2.0",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build:cjs": "tsc --build tsconfig.cjs.json",

diff --git a/packages/uniforms-bridge-zod/package.json b/packages/uniforms-bridge-zod/package.json
@@ -44,7 +44,7 @@
     "@types/invariant": "2.2.37",
     "@types/lodash": "4.17.5",
     "tslib": "2.2.0",
-    "typescript": "4.4.4"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build:cjs": "tsc --build tsconfig.cjs.json",