Merge pull request #407 from complexdatacollective/next

Next

Author: jthrilly

components/Link.tsx

@@ -1,6 +1,6 @@
-import NextLink, { type LinkProps, type LinkRestProps } from 'next/link';
+import NextLink from 'next/link';
 
-export default function Link(props: LinkProps<LinkRestProps>) {
+export default function Link(props: React.ComponentProps<typeof NextLink>) {
   return (
     <NextLink
       className="text-link group font-semibold transition-all duration-300 ease-in-out"

hooks/useZodForm.ts

@@ -1,18 +1,25 @@
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm, type UseFormProps } from 'react-hook-form';
-import type { z } from 'zod';
+import { standardSchemaResolver } from '@hookform/resolvers/standard-schema';
+import {
+  useForm as __useForm,
+  type FieldValues,
+  type UseFormProps,
+} from 'react-hook-form';
+import type { ZodType, ZodTypeDef } from 'zod/v3';
 
 /**
  * Reusable hook for zod + react-hook-form
  */
-export default function useZodForm<TSchema extends z.ZodType>(
-  props: Omit<UseFormProps<TSchema['_input']>, 'resolver'> & {
-    schema: TSchema;
+export default function useForm<
+  TOut extends FieldValues,
+  TIn extends FieldValues,
+>(
+  props: Omit<UseFormProps<TIn, unknown, TOut>, 'resolver'> & {
+    schema: ZodType<TOut, ZodTypeDef, TIn>;
   },
 ) {
-  const form = useForm<TSchema['_input']>({
+  const form = __useForm<TIn, unknown, TOut>({
     ...props,
-    resolver: zodResolver(props.schema, undefined),
+    resolver: standardSchemaResolver(props.schema, undefined),
   });
 
   return form;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fresco",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "private": true,
   "type": "module",
   "packageManager": "pnpm@9.1.1+sha256.9551e803dcb7a1839fdf5416153a844060c7bce013218ce823410532504ac10b",
@@ -26,7 +26,7 @@
     "@codaco/analytics": "7.0.0",
     "@codaco/protocol-validation": "3.0.0",
     "@codaco/shared-consts": "^0.0.2",
-    "@hookform/resolvers": "^5.0.1",
+    "@hookform/resolvers": "^5.1.1",
     "@lucia-auth/adapter-prisma": "^3.0.2",
     "@paralleldrive/cuid2": "^2.2.2",
     "@radix-ui/react-alert-dialog": "^1.1.14",
@@ -60,25 +60,25 @@
     "csvtojson": "^2.0.10",
     "d3-interpolate-path": "^2.3.0",
     "dotenv": "^16.5.0",
-    "es-toolkit": "^1.38.0",
+    "es-toolkit": "^1.39.3",
     "fuse.js": "^7.1.0",
     "jssha": "^3.3.1",
     "jszip": "^3.10.1",
     "lucia": "^2.7.7",
-    "lucide-react": "^0.511.0",
-    "luxon": "^3.5.0",
-    "motion": "^12.12.1",
-    "next": "^14.2.26",
+    "lucide-react": "^0.516.0",
+    "luxon": "^3.6.1",
+    "motion": "^12.18.1",
+    "next": "^14.2.30",
     "nuqs": "^1.20.0",
     "ohash": "^1.1.4",
     "papaparse": "^5.5.3",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.6",
     "react": "18.3.1",
     "react-compound-slider": "^3.4.0",
     "react-dom": "18.3.1",
     "react-dropzone": "^14.3.8",
     "react-flip-toolkit": "^7.2.4",
-    "react-hook-form": "^7.56.4",
+    "react-hook-form": "^7.58.1",
     "react-markdown": "^9.0.3",
     "react-redux": "^8.1.3",
     "react-resize-aware": "^4.0.0",
@@ -98,53 +98,53 @@
     "scrollparent": "^2.1.0",
     "sharp": "^0.34.2",
     "strip-markdown": "^6.0.0",
-    "tailwind-merge": "^3.3.0",
+    "tailwind-merge": "^3.3.1",
     "uploadthing": "^7.7.2",
     "usehooks-ts": "^3.1.1",
     "uuid": "^11.1.0",
-    "validator": "^13.15.0",
-    "zod": "^3.25.16",
+    "validator": "^13.15.15",
+    "zod": "^3.25.67",
     "zod-form-data": "^2.0.7"
   },
   "devDependencies": {
-    "@playwright/test": "^1.52.0",
-    "@prisma/client": "^6.8.2",
-    "@t3-oss/env-nextjs": "^0.13.4",
+    "@playwright/test": "^1.53.0",
+    "@prisma/client": "^6.10.0",
+    "@t3-oss/env-nextjs": "^0.13.8",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/forms": "^0.5.10",
-    "@tailwindcss/postcss": "4.1.7",
+    "@tailwindcss/postcss": "4.1.10",
     "@tailwindcss/typography": "^0.5.16",
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/archiver": "^6.0.3",
     "@types/async": "^3.2.24",
     "@types/d3-interpolate-path": "^2.0.3",
     "@types/eslint": "^8.56.12",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.13.9",
     "@types/papaparse": "^5.3.16",
     "@types/react": "^18.3.7",
     "@types/react-dom": "^18.3.1",
     "@types/redux-form": "^8.3.11",
     "@types/uuid": "^10.0.0",
-    "@types/validator": "^13.15.1",
-    "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@typescript-eslint/parser": "^8.32.1",
-    "@vitejs/plugin-react": "^4.4.1",
+    "@types/validator": "^13.15.2",
+    "@typescript-eslint/eslint-plugin": "^8.34.1",
+    "@typescript-eslint/parser": "^8.34.1",
+    "@vitejs/plugin-react": "^4.5.2",
     "eslint": "^8.57.1",
-    "eslint-config-next": "^15.3.2",
+    "eslint-config-next": "^15.3.3",
     "eslint-config-prettier": "^10.1.5",
-    "jest": "^29.7.0",
+    "jest": "^30.0.0",
     "jsdom": "^26.1.0",
-    "knip": "^5.57.0",
+    "knip": "^5.61.1",
     "prettier": "^3.5.3",
-    "prettier-plugin-tailwindcss": "^0.6.11",
-    "prisma": "^6.8.2",
-    "sass": "^1.89.0",
-    "tailwindcss": "4.1.7",
+    "prettier-plugin-tailwindcss": "^0.6.12",
+    "prisma": "^6.10.0",
+    "sass": "^1.89.2",
+    "tailwindcss": "4.1.10",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "5.8.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.1.4"
+    "vitest": "^3.2.4"
   }
 }