From c054615891883eb4edb4d53228f5006862a8b8ad Mon Sep 17 00:00:00 2001
From: Quentin Renard <quentin@area17.com>
Date: Mon, 14 Oct 2024 18:17:04 +0200
Subject: [PATCH] Ensure catch-all routes do not take precedence

Fixes #2646 by moving to a regular service provider instead of inheriting from Laravel's route service provider, because it loads routes after boot, but we need registered as soon as the router is resolved.

This is a problem that affected first-party Laravel tools like Pulse, too: https://github.com/laravel/pulse/commit/9ab920b5894582698669cc9c0b7e8b3aa74465d5
---
 src/RouteServiceProvider.php | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/RouteServiceProvider.php b/src/RouteServiceProvider.php
index 16a18b19b..300810c6a 100644
--- a/src/RouteServiceProvider.php
+++ b/src/RouteServiceProvider.php
@@ -12,7 +12,7 @@
 use A17\Twill\Http\Middleware\ValidateBackHistory;
 use A17\Twill\Services\MediaLibrary\Glide;
 use A17\Twill\Facades\TwillRoutes;
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
@@ -29,26 +29,27 @@ public function boot(): void
         $this->registerRouteMiddlewares();
         $this->app->bind(TwillRoutes::class);
         $this->registerRouteMacros();
-        parent::boot();
     }
 
-    public function map(Router $router): void
+    public function register()
     {
-        \A17\Twill\Facades\TwillRoutes::registerRoutePatterns();
-
-        $this->mapInternalRoutes(
-            $router,
-            \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
-            \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
-            \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
-        );
+        $this->callAfterResolving(Router::class, function (Router $router) {
+            \A17\Twill\Facades\TwillRoutes::registerRoutePatterns();
+
+            $this->mapInternalRoutes(
+                $router,
+                \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
+                \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
+                \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
+            );
 
-        $this->mapHostRoutes(
-            $router,
-            \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
-            \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
-            \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
-        );
+            $this->mapHostRoutes(
+                $router,
+                \A17\Twill\Facades\TwillRoutes::getRouteGroupOptions(),
+                \A17\Twill\Facades\TwillRoutes::getRouteMiddleware(),
+                \A17\Twill\Facades\TwillRoutes::supportSubdomainRouting()
+            );
+        });
     }
 
     private function mapHostRoutes(