ziggy -> wayfinder

joetannenbaum · joetannenbaum · commit ef7e29df17bd · 2025-09-04T13:22:45.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@
 /public/storage
 /storage/*.key
 /storage/pail
+/resources/js/wayfinder
+/resources/js/routes
+/resources/js/actions
 /vendor
 .env
 .env.backup
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,2 @@
 resources/js/components/ui/*
-resources/js/ziggy.js
 resources/views/mail/*
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
@@ -5,7 +5,6 @@
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
-use Tighten\Ziggy\Ziggy;
 
 class HandleInertiaRequests extends Middleware
 {
@@ -46,10 +45,6 @@ public function share(Request $request): array
             'auth' => [
                 'user' => $request->user(),
             ],
-            'ziggy' => fn (): array => [
-                ...(new Ziggy)->toArray(),
-                'location' => $request->url(),
-            ],
         ];
     }
 }
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "inertiajs/inertia-laravel": "^2.0",
         "laravel/framework": "^12.0",
         "laravel/tinker": "^2.10.1",
-        "tightenco/ziggy": "^2.4"
+        "laravel/wayfinder": "^0.1.11"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     },
     "devDependencies": {
         "@eslint/js": "^9.19.0",
+        "@laravel/vite-plugin-wayfinder": "^0.1.3",
         "@types/node": "^22.13.5",
         "eslint": "^9.17.0",
         "eslint-config-prettier": "^10.0.1",
diff --git a/resources/js/ssr.tsx b/resources/js/ssr.tsx
@@ -2,7 +2,6 @@ import { createInertiaApp } from '@inertiajs/react';
 import createServer from '@inertiajs/react/server';
 import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers';
 import ReactDOMServer from 'react-dom/server';
-import { type RouteName, route } from 'ziggy-js';
 
 const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
 
@@ -12,19 +11,6 @@ createServer((page) =>
         render: ReactDOMServer.renderToString,
         title: (title) => title ? `${title} - ${appName}` : appName,
         resolve: (name) => resolvePageComponent(`./pages/${name}.tsx`, import.meta.glob('./pages/**/*.tsx')),
-        setup: ({ App, props }) => {
-            /* eslint-disable */
-            // @ts-expect-error
-            global.route<RouteName> = (name, params, absolute) =>
-                route(name, params as any, absolute, {
-                    // @ts-expect-error
-                    ...page.props.ziggy,
-                    // @ts-expect-error
-                    location: new URL(page.props.ziggy.location),
-                });
-            /* eslint-enable */
-
-            return <App {...props} />;
-        },
+        setup: ({ App, props }) => <App {...props} />,
     }),
 );
diff --git a/resources/js/types/global.d.ts b/resources/js/types/global.d.ts
diff --git a/resources/js/types/index.d.ts b/resources/js/types/index.d.ts
@@ -1,5 +1,3 @@
-import type { Config } from 'ziggy-js';
-
 export interface Auth {
     user: User;
 }
@@ -8,7 +6,6 @@ export interface SharedData {
     name: string;
     quote: { message: string; author: string };
     auth: Auth;
-    ziggy: Config & { location: string };
     [key: string]: unknown;
 }
 
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -13,7 +13,6 @@
         <link rel="preconnect" href="https://fonts.bunny.net">
         <link href="https://fonts.bunny.net/css?family=instrument-sans:400,500,600" rel="stylesheet" />
 
-        @routes
         @viteReactRefresh
         @vite(['resources/js/app.tsx', "resources/js/pages/{$page['component']}.tsx"])
         @inertiaHead
diff --git a/tsconfig.json b/tsconfig.json
@@ -109,8 +109,7 @@
         "skipLibCheck": true /* Skip type checking all .d.ts files. */,
         "baseUrl": ".",
         "paths": {
-            "@/*": ["./resources/js/*"],
-            "ziggy-js": ["./vendor/tightenco/ziggy"]
+            "@/*": ["./resources/js/*"]
         },
         "jsx": "react-jsx"
     },
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,7 +1,7 @@
+import { wayfinder } from '@laravel/vite-plugin-wayfinder';
 import tailwindcss from '@tailwindcss/vite';
 import react from '@vitejs/plugin-react';
 import laravel from 'laravel-vite-plugin';
-import { resolve } from 'node:path';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
@@ -13,13 +13,11 @@ export default defineConfig({
         }),
         react(),
         tailwindcss(),
+        wayfinder({
+            formVariants: true,
+        }),
     ],
     esbuild: {
         jsx: 'automatic',
     },
-    resolve: {
-        alias: {
-            'ziggy-js': resolve(__dirname, 'vendor/tightenco/ziggy'),
-        },
-    },
 });

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`resources/js/components/ui/*`
`2`		`-resources/js/ziggy.js`
`3`	`2`	`resources/views/mail/*`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use Illuminate\Foundation\Inspiring;`
`6`	`6`	`use Illuminate\Http\Request;`
`7`	`7`	`use Inertia\Middleware;`
`8`		`-use Tighten\Ziggy\Ziggy;`
`9`	`8`
`10`	`9`	`class HandleInertiaRequests extends Middleware`
`11`	`10`	`{`
`@@ -46,10 +45,6 @@ public function share(Request $request): array`
`46`	`45`	`'auth' => [`
`47`	`46`	`'user' => $request->user(),`
`48`	`47`	`],`
`49`		`- 'ziggy' => fn (): array => [`
`50`		`- ...(new Ziggy)->toArray(),`
`51`		`- 'location' => $request->url(),`
`52`		`- ],`
`53`	`48`	`];`
`54`	`49`	`}`
`55`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import type { Config } from 'ziggy-js';`
`2`		`-`
`3`	`1`	`export interface Auth {`
`4`	`2`	`user: User;`
`5`	`3`	`}`
`@@ -8,7 +6,6 @@ export interface SharedData {`
`8`	`6`	`name: string;`
`9`	`7`	`quote: { message: string; author: string };`
`10`	`8`	`auth: Auth;`
`11`		`- ziggy: Config & { location: string };`
`12`	`9`	`[key: string]: unknown;`
`13`	`10`	`}`
`14`	`11`