fixes ziggy when using SSR and determining the current URL (#163)

laravel · Jun 28, 2022 · e98e855 · e98e855
1 parent 859a8db
commit e98e855
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/stubs/inertia-common/app/Http/Middleware/HandleInertiaRequests.php b/stubs/inertia-common/app/Http/Middleware/HandleInertiaRequests.php
@@ -38,8 +38,10 @@ public function share(Request $request)
             'auth' => [
                 'user' => $request->user(),
             ],
-            'ziggy' => function () {
-                return (new Ziggy)->toArray();
+            'ziggy' => function () use ($request) {
+                return array_merge((new Ziggy)->toArray(), [
+                    'location' => $request->url(),
+                ]);
             },
         ]);
     }

diff --git a/stubs/inertia-react/resources/js/ssr.jsx b/stubs/inertia-react/resources/js/ssr.jsx
@@ -17,7 +17,7 @@ createServer((page) =>
             global.route = (name, params, absolute) =>
                 route(name, params, absolute, {
                     ...page.props.ziggy,
-                    location: new URL(page.props.ziggy.url),
+                    location: new URL(page.props.ziggy.location),
                 });
 
             return <App {...props} />;

diff --git a/stubs/inertia-vue/resources/js/ssr.js b/stubs/inertia-vue/resources/js/ssr.js
@@ -18,7 +18,7 @@ createServer((page) =>
                 .use(plugin)
                 .use(ZiggyVue, {
                     ...page.props.ziggy,
-                    location: new URL(page.props.ziggy.url),
+                    location: new URL(page.props.ziggy.location),
                 });
         },
     })