Merge pull request #4 from lifespikes/feature/inertia-v1

feature: adding support to inertia v1

Author: felipeva

README.md

@@ -21,13 +21,13 @@ npm i @lifespikes/laravel-precognition-react
 #### Using Yarn
 
 ```bash
-yarn @lifespikes/laravel-precognition-react
+yarn add @lifespikes/laravel-precognition-react
 ```
 
 #### Using pnpm
 
 ```bash
-pnpm @lifespikes/laravel-precognition-react
+pnpm add @lifespikes/laravel-precognition-react
 ```
 
 # Usage

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifespikes/laravel-precognition-react",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A set of React Hooks for Laravel Precognition",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -50,7 +50,6 @@
     }
   ],
   "devDependencies": {
-    "@inertiajs/inertia": "^0.11.1",
     "@size-limit/preset-small-lib": "^8.1.0",
     "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
@@ -68,7 +67,7 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@inertiajs/inertia-react": "^0.8.1",
+    "@inertiajs/react": "^1.0.0",
     "laravel-precognition": "^0.1.0"
   },
   "bugs": {

src/helpers/patchInertiaForm.ts

@@ -4,9 +4,9 @@ import {
   ValidationErrors,
   Validator,
 } from 'laravel-precognition/dist/types';
-import { InertiaFormProps } from '@inertiajs/inertia-react';
 import { toSimpleValidationErrors } from 'laravel-precognition';
-import { Method, VisitOptions } from '@inertiajs/inertia';
+import { InertiaFormProps } from '@inertiajs/react/types/useForm';
+import { VisitOptions, Method } from '@inertiajs/core/types/types';
 
 const getOptionsWithValidator = (
   validator: Validator,
@@ -26,7 +26,7 @@ const getOptionsWithValidator = (
   };
 };
 
-export const patchInertiaForm = <TForm = Record<string, any>>(
+export const patchInertiaForm = <TForm extends Record<string, unknown>>(
   method: RequestMethods,
   url: string,
   form: InertiaFormProps<TForm>,

src/hooks/useInertiaPrecognitionForm.ts

@@ -1,4 +1,4 @@
-import { useForm } from '@inertiajs/inertia-react';
+import { useForm } from '@inertiajs/react';
 import { useMemo } from 'react';
 import {
   UseInertiaPrecognitionFormReturn,
@@ -7,7 +7,9 @@ import {
 import { usePrecognition } from './usePrecognition';
 import { patchInertiaForm } from '../helpers/patchInertiaForm';
 
-export function useInertiaPrecognitionForm<TForm = Record<string, any>>({
+export function useInertiaPrecognitionForm<
+  TForm extends Record<string, unknown>
+>({
   precognition: { method, url, config },
   form: { initialValues },
 }: UsePrecognitionFormProps<TForm>): UseInertiaPrecognitionFormReturn<TForm> {

src/types/hooks.ts

@@ -5,7 +5,7 @@ import {
   Validator,
 } from 'laravel-precognition/dist/types';
 import { Dispatch, SetStateAction } from 'react';
-import { InertiaFormProps } from '@inertiajs/inertia-react';
+import { InertiaFormProps } from '@inertiajs/react/types/useForm';
 
 export type UsePrecognitionFormProps<TForm = Record<string, any>> = {
   precognition: {
@@ -31,11 +31,13 @@ export type UsePrecognitionReturn<TForm = Record<string, any>> = {
   setValidatorTimeout(duration: Timeout): UsePrecognitionReturn<TForm>;
 };
 
-export type InertiaPrecognitionFormProps<TForm = Record<string, any>> =
-  InertiaFormProps<TForm> & UsePrecognitionReturn<TForm>;
+export type InertiaPrecognitionFormProps<
+  TForm extends Record<string, unknown>
+> = InertiaFormProps<TForm> & UsePrecognitionReturn<TForm>;
 
-export interface UseInertiaPrecognitionFormReturn<TForm = Record<string, any>>
-  extends InertiaPrecognitionFormProps<TForm> {
+export interface UseInertiaPrecognitionFormReturn<
+  TForm extends Record<string, unknown>
+> extends InertiaPrecognitionFormProps<TForm> {
   validateAndSetDataByKeyValuePair(
     name: keyof TForm,
     value: any
@@ -46,11 +48,9 @@ export interface UseInertiaPrecognitionFormReturn<TForm = Record<string, any>>
 export type UsePrecognitionFormReturn<TForm = Record<string, any>> =
   UsePrecognitionReturn<TForm> & {
     data: TForm;
-    setData: React.Dispatch<React.SetStateAction<TForm>>;
+    setData: Dispatch<SetStateAction<TForm>>;
     errors: Record<keyof TForm, string> | null;
-    setErrors: React.Dispatch<
-      React.SetStateAction<Record<keyof TForm, string> | null>
-    >;
+    setErrors: Dispatch<SetStateAction<Record<keyof TForm, string> | null>>;
     clearErrors: () => void;
     validateAndSetDataByKeyValuePair(
       key: keyof TForm,

yarn.lock

@@ -993,22 +993,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@inertiajs/inertia-react@^0.8.1":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@inertiajs/inertia-react/-/inertia-react-0.8.1.tgz#730e1f592086c8e97e21e3f4ed639cb952bcfd77"
-  integrity sha512-9Uu7t4EA9FrcREwWnOU/qW5i4hYFt+uFn5cqP6RGJo8lJS4u8t6Q9358oHuQUKbFEbaIjUu7aslCL3/Istctlg==
-  dependencies:
-    lodash.isequal "^4.5.0"
-
-"@inertiajs/inertia@^0.11.1":
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/@inertiajs/inertia/-/inertia-0.11.1.tgz#f324f09a03e1dd944404bd09935c0141a4b3a85d"
-  integrity sha512-btmV53c54oW4Z9XF0YyTdIUnM7ue0ONy3/KJOz6J1C5CYIwimiKfDMpz8ZbGJuxS+SPdOlNsqj2ZhlHslpJRZg==
+"@inertiajs/[email protected]":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@inertiajs/core/-/core-1.0.0.tgz#40e5b71d20ff0e6b5e7e2b5c9091b720e4600030"
+  integrity sha512-V8GgUMqwD6L0A+/O5EEnoCKI/CJ6o33/PUlrjte2skAixZmuNjL3AcP1pB5xUPLMFxGONpZVU2BTpqTC2ppLGA==
   dependencies:
-    axios "^0.21.1"
+    axios "^1.2.0"
     deepmerge "^4.0.0"
+    nprogress "^0.2.0"
     qs "^6.9.0"
 
+"@inertiajs/react@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@inertiajs/react/-/react-1.0.0.tgz#dfd3ca3f1078fbc303df2876651d08f071e20222"
+  integrity sha512-oJnLjV1qw2zif5LRta3ota+pXbc8N7NZ8JeoYsJk/DeOlv6S/Yz6WZYGksVUu0zxcpoYeMZEZ3q7vxiq+0UhkA==
+  dependencies:
+    "@inertiajs/core" "1.0.0"
+    lodash.isequal "^4.5.0"
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1904,13 +1906,6 @@ axe-core@^4.4.3:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.0.tgz#1d07514866fa51262734b3357932fcf86961383a"
   integrity sha512-L3ZNbXPTxMrl0+qTXAzn9FBRvk5XdO56K8CvcCKtlxv44Aw2w2NCclGuvCWxHPw1Riiq3ncP/sxFYj2nUqdoTw==
 
-axios@^0.21.1:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
 axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
@@ -1919,6 +1914,15 @@ axios@^0.27.2:
     follow-redirects "^1.14.9"
     form-data "^4.0.0"
 
+axios@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3"
+  integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -2536,7 +2540,12 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.0.0, deepmerge@^4.2.2:
+deepmerge@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b"
+  integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==
+
+deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -3470,7 +3479,7 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.9:
+follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -5234,6 +5243,11 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
+nprogress@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
+  integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==
+
 nwsapi@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
@@ -5610,6 +5624,11 @@ prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 psl@^1.1.28:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"