Merge pull request #110 from justdlabs/laravel-11.x

Laravel 11.x

CHANGELOG.md

@@ -1,11 +1,17 @@
 
 
-## [1.0.28](https://github.com/justdlabs/inertia.ts/compare/1.0.27...1.0.28) (2024-10-14)
+## [1.0.29](https://github.com/justdlabs/inertia.ts/compare/1.0.28...1.0.29) (2024-10-16)
+
+
+### Bug Fixes
+
+* add ziggy location to inertia middleware ([a40dbc6](https://github.com/justdlabs/inertia.ts/commit/a40dbc68fe0650f9f6b8756067932521e45f805b))
 
+## [1.0.28](https://github.com/justdlabs/inertia.ts/compare/1.0.27...1.0.28) (2024-10-14)
 
 ### Bug Fixes
 
-* fix prettier ([0d32de2](https://github.com/justdlabs/inertia.ts/commit/0d32de2abe4d90fddf448997df697f037bca945b))
+-   fix prettier ([0d32de2](https://github.com/justdlabs/inertia.ts/commit/0d32de2abe4d90fddf448997df697f037bca945b))
 
 ## [1.0.27](https://github.com/justdlabs/inertia.ts/compare/1.0.26...1.0.27) (2024-10-14)
 

app/Http/Middleware/HandleInertiaRequests.php

@@ -35,6 +35,10 @@ public function share(Request $request): array
             'auth' => [
                 'user' => $request->user() ? AuthenticatedUserData::from($request->user()) : null,
             ],
+            'ziggy' => fn () => [
+                'location' => $request->url(),
+                'query' => $request->query(),
+            ],
             'flash_message' => fn () => [
                 'type' => $request->session()->get('type') ?? 'success',
                 'message' => $request->session()->get('message'),

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "justd/laravel",
-    "version": "1.0.28",
+    "version": "1.0.29",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
     "keywords": [

package.json

@@ -80,5 +80,5 @@
             }
         }
     },
-    "version": "1.0.28"
+    "version": "1.0.29"
 }

postcss.config.js

@@ -3,4 +3,4 @@ export default {
         tailwindcss: {},
         autoprefixer: {}
     }
-}
+};

resources/js/app.tsx

@@ -1,33 +1,33 @@
-import '../css/app.css'
-import './bootstrap'
+import '../css/app.css';
+import './bootstrap';
 
-import { Ziggy } from '@/ziggy'
-import { createInertiaApp } from '@inertiajs/react'
-import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'
-import { createRoot, hydrateRoot } from 'react-dom/client'
-import { useRoute } from 'ziggy-js'
-import { Providers } from './providers'
+import { Ziggy } from '@/ziggy';
+import { createInertiaApp } from '@inertiajs/react';
+import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
+import { createRoot, hydrateRoot } from 'react-dom/client';
+import { useRoute } from 'ziggy-js';
+import { Providers } from './providers';
 
-const appName = import.meta.env.VITE_APP_NAME || 'Laravel'
+const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
 
 createInertiaApp({
     title: (title) => (title ? `${title} / ${appName}` : appName),
     resolve: (name) => resolvePageComponent(`./pages/${name}.tsx`, import.meta.glob('./pages/**/*.tsx')),
     setup({ el, App, props }) {
-        window.route = useRoute(Ziggy as any)
+        window.route = useRoute(Ziggy as any);
         const appElement = (
             <Providers>
                 <App {...props} />
             </Providers>
-        )
+        );
         if (import.meta.env.DEV) {
-            createRoot(el).render(appElement)
-            return
+            createRoot(el).render(appElement);
+            return;
         }
 
-        hydrateRoot(el, appElement)
+        hydrateRoot(el, appElement);
     },
     progress: {
         color: '#4B5563'
     }
-})
+});

resources/js/bootstrap.ts

@@ -1,5 +1,5 @@
-import axios from 'axios'
+import axios from 'axios';
 
-window.axios = axios
+window.axios = axios;
 
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'
+window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';

resources/js/components/container.tsx

@@ -1,12 +1,12 @@
-import React from 'react'
+import React from 'react';
 
-import { cn } from 'ui'
+import { cn } from 'ui';
 
 const Container = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
     ({ className, ...props }, ref) => (
         <div className={cn('mx-auto max-w-7xl px-4 sm:px-6 lg:px-8', className)} {...props} ref={ref} />
     )
-)
-Container.displayName = 'Container'
+);
+Container.displayName = 'Container';
 
-export { Container }
+export { Container };

resources/js/components/flash-message.tsx

@@ -1,15 +1,15 @@
-import { FlashMessageData } from '@/types/index'
-import { usePage } from '@inertiajs/react'
-import { useEffect } from 'react'
-import { toast } from 'sonner'
-import { Toast } from 'ui'
+import { FlashMessageData } from '@/types/index';
+import { usePage } from '@inertiajs/react';
+import { useEffect } from 'react';
+import { toast } from 'sonner';
+import { Toast } from 'ui';
 
 export function FlashMessage() {
-    const { flash_message } = usePage<{ flash_message: FlashMessageData }>().props
+    const { flash_message } = usePage<{ flash_message: FlashMessageData }>().props;
     useEffect(() => {
         if (flash_message && flash_message.message) {
-            ;(toast as any)[flash_message.type](flash_message.message)
+            (toast as any)[flash_message.type](flash_message.message);
         }
-    }, [flash_message])
-    return <Toast />
+    }, [flash_message]);
+    return <Toast />;
 }

resources/js/components/footer.tsx

@@ -1,6 +1,6 @@
-import { ThemeToggle } from 'components/theme-toggle'
-import { SVGProps } from 'react'
-import { Button, Link, TextField } from 'ui'
+import { ThemeToggle } from 'components/theme-toggle';
+import { SVGProps } from 'react';
+import { Button, Link, TextField } from 'ui';
 
 const navigation = {
     solutions: [
@@ -89,7 +89,7 @@ const navigation = {
             )
         }
     ]
-}
+};
 
 export function Footer() {
     return (
@@ -212,5 +212,5 @@ export function Footer() {
                 </div>
             </div>
         </footer>
-    )
+    );
 }

resources/js/components/header.tsx

@@ -1,6 +1,6 @@
-import { Container } from 'components/container'
-import * as React from 'react'
-import { cn } from 'ui'
+import { Container } from 'components/container';
+import * as React from 'react';
+import { cn } from 'ui';
 
 const Header = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
     ({ className, ...props }, ref) => (
@@ -10,7 +10,7 @@ const Header = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElem
             </Container>
         </div>
     )
-)
-Header.displayName = 'Header'
+);
+Header.displayName = 'Header';
 
-export { Header }
+export { Header };

resources/js/components/input-error.tsx

@@ -1,5 +1,5 @@
-import { HTMLAttributes } from 'react'
-import { cn, Description } from 'ui'
+import { HTMLAttributes } from 'react';
+import { cn, Description } from 'ui';
 
 export function InputError({
     message,
@@ -10,5 +10,5 @@ export function InputError({
         <Description {...props} className={cn('text-sm block text-danger')}>
             {message}
         </Description>
-    ) : null
+    ) : null;
 }

resources/js/components/logo.tsx

@@ -1,7 +1,7 @@
-import { IconBrandLaravel } from 'justd-icons'
-import React from 'react'
-import { cn } from 'ui'
+import { IconBrandLaravel } from 'justd-icons';
+import React from 'react';
+import { cn } from 'ui';
 
 export function Logo({ className, ...props }: React.SVGProps<SVGSVGElement>) {
-    return <IconBrandLaravel className={cn('size-6', className)} {...props} />
+    return <IconBrandLaravel className={cn('size-6', className)} {...props} />;
 }