Merge branch 'main' into storage

Author: joetannenbaum

README.md

@@ -15,7 +15,9 @@ To get started, install Wayfinder via the Composer package manager:
 composer require laravel/wayfinder
 ```
 
-If you would like to automatically watch your files for changes, you should also install the `vite-plugin-run` npm package:
+We also recommend installing and configuring [`vite-plugin-run`](https://github.com/innocenzi/vite-plugin-run) to ensure that your routes are generated during Vite's build step and also whenever your files change while running the Vite's dev server.
+
+First, install the plugin via NPM:
 
 ```
 npm i -D vite-plugin-run

build.ts

@@ -1,17 +1,24 @@
 import { execSync } from "node:child_process";
 import path from "node:path";
 
-export default function setup() {
+const testbenchDir = path.join(__dirname, "vendor", "bin", "testbench");
+
+const artisan = (command: string): void => console.error(execSync(`${testbenchDir} ${command}`).toString('utf8'))
+
+export function setup(): void {
     try {
-        const testbenchDir = path.join(__dirname, "vendor", "bin", "testbench");
+        process.env.WAYFINDER_CACHE_ROUTES
+            ? artisan('route:cache')
+            : artisan('route:clear')
 
-        execSync(
-            `${testbenchDir} wayfinder:generate --path=workbench/resources/js --with-form`,
-        );
+        artisan('wayfinder:generate --path=workbench/resources/js --with-form')
     } catch (error) {
-        console.error(
-            `Wayfinder build error.\n----------${error.output}\n----------`,
-        );
+        console.error(`Wayfinder build error\n----------${error.output}\n----------`);
+
         process.exit(1);
     }
 }
+
+export function teardown(): void {
+    artisan('route:clear')
+}

package.json

@@ -1,7 +1,8 @@
 {
     "type": "module",
     "scripts": {
-        "test": "vitest run"
+        "test": "vitest run && npm run test-routes-cached",
+        "test-routes-cached": "WAYFINDER_CACHE_ROUTES=1 vitest run"
     },
     "devDependencies": {
         "@types/node": "^22.7.5",

src/Route.php

@@ -2,8 +2,10 @@
 
 namespace Laravel\Wayfinder;
 
+use Closure;
 use Illuminate\Contracts\Routing\UrlRoutable;
 use Illuminate\Routing\Route as BaseRoute;
+use Illuminate\Routing\RouteAction;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Laravel\SerializableClosure\Support\ReflectionClosure;
@@ -127,7 +129,7 @@ public function controllerPath(): string
         $controller = $this->controller();
 
         if ($controller === '\\Closure') {
-            return $this->relativePath((new ReflectionClosure($this->base->getAction()['uses']))->getFileName());
+            return $this->relativePath((new ReflectionClosure($this->closure()))->getFileName());
         }
 
         if (! class_exists($controller)) {
@@ -142,7 +144,7 @@ public function controllerMethodLineNumber(): int
         $controller = $this->controller();
 
         if ($controller === '\\Closure') {
-            return (new ReflectionClosure($this->base->getAction()['uses']))->getStartLine();
+            return (new ReflectionClosure($this->closure()))->getStartLine();
         }
 
         if (! class_exists($controller)) {
@@ -167,4 +169,11 @@ private function relativePath(string $path)
     {
         return ltrim(str_replace(base_path(), '', $path), DIRECTORY_SEPARATOR);
     }
+
+    private function closure(): Closure
+    {
+        return RouteAction::containsSerializedClosure($this->base->getAction())
+            ? unserialize($this->base->getAction('uses'))->getClosure()
+            : $this->base->getAction('uses');
+    }
 }