Enhanced Router Compatibility (Including Livewire Support) And Filters For Early Service Container Overrides

src/Roots/Acorn/Bootloader.php

@@ -111,10 +111,6 @@ public function boot($callback = null)
         }
 
         if (Env::get('ACORN_ENABLE_EXPIRIMENTAL_ROUTER')) {
-            $app->singleton(
-                \Illuminate\Contracts\Http\Kernel::class,
-                \Roots\Acorn\Http\Kernel::class
-            );
             return $this->bootHttp($app);
         }
 
@@ -201,39 +197,50 @@ protected function bootHttp(ApplicationContract $app)
     {
         $kernel = $app->make(\Illuminate\Contracts\Http\Kernel::class);
         $request = \Illuminate\Http\Request::capture();
+        $time = time();
 
         $app->instance('request', $request);
         Facade::clearResolvedInstance('request');
 
         $kernel->bootstrap($request);
 
-        try {
+        add_filter('do_parse_request', function ($do_parse, \WP $wp, $extra_query_vars) use ($app, $request) {
             if (! $app->make('router')->getRoutes()->match($request)) {
-                throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
+                return $do_parse;
             }
-        } catch (\Exception $e) {
-            return;
-        }
 
-        add_filter(
-            'do_parse_request',
-            fn ($do_parse, \WP $wp, $extra_query_vars) =>
-            apply_filters('acorn/router/do_parse_request', $do_parse, $wp, $extra_query_vars),
-            100,
-            3
-        );
+            return apply_filters('acorn/router/do_parse_request', $do_parse, $wp, $extra_query_vars);
+        }, 100, 3);
+
+        // Create a default route for wordpress routes to use
+        $app->make('router')
+            ->get('{any?}', fn () => response()->json(['message' => "wordpress_request_$time" ]))
+            ->where('any', '.*');
 
-        add_action('parse_request', function () use ($kernel, $request) {
-            /** @var \Illuminate\Http\Response */
+        add_action('parse_request', function () use ($time, $kernel, $request) {
+            /**
+             * @var \Symfony\Component\HttpFoundation\Response $response
+             * @see \Illuminate\Contracts\Routing\ResponseFactory
+             */
             $response = $kernel->handle($request);
 
-            if (! $response->isServerError() && $response->status() >= 400) {
+            if ($response instanceof \Symfony\Component\HttpFoundation\Response
+                && ! $response->isServerError()
+                && $response->getStatusCode() >= 400
+            ) {
                 return;
             }
 
-            $body = $response->send();
+            if (in_array(false, [
+                $response instanceof \Illuminate\Http\JsonResponse,
+                is_string($response->getContent()),
+                $data = json_decode($response->getContent()),
+                isset($data->message) && $data->message == "wordpress_request_$time",
+            ])) {
+                $body = $response->send();
 
-            $kernel->terminate($request, $body);
+                $kernel->terminate($request, $body);
+            }
         });
     }
 
@@ -259,20 +266,22 @@ public function getApplication(): ApplicationContract
     {
         $this->app ??= new Application($this->basePath(), $this->usePaths());
 
-        $this->app->singleton(
-            \Illuminate\Contracts\Http\Kernel::class,
-            \Roots\Acorn\Kernel::class
-        );
-
-        $this->app->singleton(
-            \Illuminate\Contracts\Console\Kernel::class,
-            \Roots\Acorn\Console\Kernel::class
-        );
-
-        $this->app->singleton(
-            \Illuminate\Contracts\Debug\ExceptionHandler::class,
-            \Roots\Acorn\Exceptions\Handler::class
-        );
+        $httpKernel = Env::get('ACORN_ENABLE_EXPIRIMENTAL_ROUTER')
+            ? \Roots\Acorn\Http\Kernel::class
+            : \Roots\Acorn\Kernel::class;
+
+        collect([
+            \Illuminate\Contracts\Http\Kernel::class => $httpKernel,
+            \Illuminate\Contracts\Console\Kernel::class => \Roots\Acorn\Console\Kernel::class,
+            \Illuminate\Contracts\Debug\ExceptionHandler::class => \Roots\Acorn\Exceptions\Handler::class,
+        ])
+        ->map(fn($concrete, $abstract) => apply_filters(
+            "acorn/container/"
+            . Str::of($abstract)->replaceFirst('Illuminate\\Contracts', '')->replace('\\', ' ')->slug(),
+            $concrete,
+            $abstract
+        ))
+        ->each(fn($concrete, $abstract) => $this->app->singleton($abstract, $concrete));
 
         if (class_exists(\Whoops\Run::class)) {
             $this->app->bind(