diff --git a/packages/core/src/router.ts b/packages/core/src/router.ts index 37042dad9..a60f5558d 100644 --- a/packages/core/src/router.ts +++ b/packages/core/src/router.ts @@ -1,4 +1,4 @@ -import { AxiosResponse, default as Axios } from 'axios' +import { default as Axios, AxiosResponse } from 'axios' import debounce from './debounce' import { fireBeforeEvent, diff --git a/packages/react/src/Head.ts b/packages/react/src/Head.ts index c621dedaa..71702c1d7 100644 --- a/packages/react/src/Head.ts +++ b/packages/react/src/Head.ts @@ -86,7 +86,9 @@ const Head: InertiaHead = function ({ children, title }) { } function renderNodes(nodes) { - const computed = React.Children.toArray(nodes).filter((node) => node).map((node) => renderNode(node)) + const computed = React.Children.toArray(nodes) + .filter((node) => node) + .map((node) => renderNode(node)) if (title && !computed.find((tag) => tag.startsWith('${title}`) } diff --git a/packages/react/src/createInertiaApp.ts b/packages/react/src/createInertiaApp.ts index e8c2734ae..2a83c4111 100644 --- a/packages/react/src/createInertiaApp.ts +++ b/packages/react/src/createInertiaApp.ts @@ -1,5 +1,5 @@ import { Page, PageProps, PageResolver, setupProgress } from '@inertiajs/core' -import { ComponentType, createElement, FunctionComponent, Key, ReactElement, ReactNode } from 'react' +import { ComponentType, FunctionComponent, Key, ReactElement, ReactNode, createElement } from 'react' import { renderToString } from 'react-dom/server' import App from './App' diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts index 6b13ec581..5d0f6ae66 100755 --- a/packages/react/src/index.ts +++ b/packages/react/src/index.ts @@ -1,9 +1,9 @@ import { router as Router } from '@inertiajs/core' export const router = Router -export { default as createInertiaApp } from './createInertiaApp' export { default as Head } from './Head' -export { default as Link, InertiaLinkProps } from './Link' +export { InertiaLinkProps, default as Link } from './Link' +export { default as createInertiaApp } from './createInertiaApp' export { default as useForm } from './useForm' export { default as usePage } from './usePage' export { default as useRemember } from './useRemember' diff --git a/packages/react/src/useForm.ts b/packages/react/src/useForm.ts index 22af09f4a..432a289eb 100644 --- a/packages/react/src/useForm.ts +++ b/packages/react/src/useForm.ts @@ -6,7 +6,7 @@ import useRemember from './useRemember' type setDataByObject = (data: TForm) => void type setDataByMethod = (data: (previousData: TForm) => TForm) => void type setDataByKeyValuePair = (key: K, value: TForm[K]) => void -type FormDataType = object; +type FormDataType = object export interface InertiaFormProps { data: TForm diff --git a/packages/svelte/src/index.js b/packages/svelte/src/index.js index 0a886940b..7a2bd597b 100755 --- a/packages/svelte/src/index.js +++ b/packages/svelte/src/index.js @@ -1,7 +1,7 @@ export { router } from '@inertiajs/core' +export { default as Link } from './Link.svelte' export { default as createInertiaApp } from './createInertiaApp' export { default as inertia } from './link' -export { default as Link } from './Link.svelte' export { default as page } from './page' export { default as remember } from './remember' export { default as useForm } from './useForm' diff --git a/packages/svelte/src/useForm.js b/packages/svelte/src/useForm.js index d624f65d6..5009ead9c 100644 --- a/packages/svelte/src/useForm.js +++ b/packages/svelte/src/useForm.js @@ -1,6 +1,6 @@ import { router } from '@inertiajs/core' -import isEqual from 'lodash.isequal' import cloneDeep from 'lodash.clonedeep' +import isEqual from 'lodash.isequal' import { writable } from 'svelte/store' function useForm(...args) { diff --git a/packages/vue2/src/index.ts b/packages/vue2/src/index.ts index 462c03ca6..b1b6274a0 100755 --- a/packages/vue2/src/index.ts +++ b/packages/vue2/src/index.ts @@ -2,6 +2,6 @@ export { router } from '@inertiajs/core' export { usePage } from './app' export { default as createInertiaApp } from './createInertiaApp' export { default as Head } from './head' -export { default as Link, InertiaLinkProps } from './link' +export { InertiaLinkProps, default as Link } from './link' export * from './types' -export { default as useForm, InertiaForm } from './useForm' +export { InertiaForm, default as useForm } from './useForm' diff --git a/packages/vue2/src/useForm.ts b/packages/vue2/src/useForm.ts index 20a2ebc25..a8376bfb9 100644 --- a/packages/vue2/src/useForm.ts +++ b/packages/vue2/src/useForm.ts @@ -3,7 +3,7 @@ import cloneDeep from 'lodash.clonedeep' import isEqual from 'lodash.isequal' import { reactive, watch } from 'vue' -type FormDataType = object; +type FormDataType = object interface InertiaFormProps { isDirty: boolean @@ -39,7 +39,10 @@ export interface InertiaFormTrait { } export default function useForm(data: TForm | (() => TForm)): InertiaForm -export default function useForm(rememberKey: string, data: TForm | (() => TForm)): InertiaForm +export default function useForm( + rememberKey: string, + data: TForm | (() => TForm), +): InertiaForm export default function useForm(...args): InertiaForm { const rememberKey = typeof args[0] === 'string' ? args[0] : null const data = (typeof args[0] === 'string' ? args[1] : args[0]) || {} diff --git a/packages/vue2/tests/app/index.html b/packages/vue2/tests/app/index.html index 1bb678b3b..2f5b89ad7 100644 --- a/packages/vue2/tests/app/index.html +++ b/packages/vue2/tests/app/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/vue3/src/createInertiaApp.ts b/packages/vue3/src/createInertiaApp.ts index dfa11e26a..8d69214eb 100644 --- a/packages/vue3/src/createInertiaApp.ts +++ b/packages/vue3/src/createInertiaApp.ts @@ -1,5 +1,5 @@ import { Page, setupProgress } from '@inertiajs/core' -import { App as VueApp, createSSRApp, DefineComponent, h, Plugin } from 'vue' +import { DefineComponent, Plugin, App as VueApp, createSSRApp, h } from 'vue' import App, { InertiaApp, InertiaAppProps, plugin } from './app' interface CreateInertiaAppProps { diff --git a/packages/vue3/src/index.ts b/packages/vue3/src/index.ts index c046c5f3e..1bb8eac33 100755 --- a/packages/vue3/src/index.ts +++ b/packages/vue3/src/index.ts @@ -2,7 +2,7 @@ export { router } from '@inertiajs/core' export { usePage } from './app' export { default as createInertiaApp } from './createInertiaApp' export { default as Head } from './head' -export { default as Link, InertiaLinkProps } from './link' +export { InertiaLinkProps, default as Link } from './link' export * from './types' -export { default as useForm, InertiaForm } from './useForm' +export { InertiaForm, default as useForm } from './useForm' export { default as useRemember } from './useRemember' diff --git a/packages/vue3/src/useForm.ts b/packages/vue3/src/useForm.ts index d617a80c7..d0a236b63 100644 --- a/packages/vue3/src/useForm.ts +++ b/packages/vue3/src/useForm.ts @@ -3,7 +3,7 @@ import cloneDeep from 'lodash.clonedeep' import isEqual from 'lodash.isequal' import { reactive, watch } from 'vue' -type FormDataType = object; +type FormDataType = object interface InertiaFormProps { isDirty: boolean