From 80a9619a82327ea8798656b08bab24b40ef3b1f3 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Wed, 9 Feb 2022 11:05:31 +0100
Subject: [PATCH 01/16] Support custom admin panel paths with other parameters

---
 packages/admin/src/Http/Controllers/AssetController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/admin/src/Http/Controllers/AssetController.php b/packages/admin/src/Http/Controllers/AssetController.php
index 597a6ba0187..96b03c3d9ab 100644
--- a/packages/admin/src/Http/Controllers/AssetController.php
+++ b/packages/admin/src/Http/Controllers/AssetController.php
@@ -9,6 +9,12 @@ class AssetController
 {
     public function __invoke(string $file)
     {
+        // The first argument to __invoke will be the first parameter in the complete route,
+        // and not the parameter named 'file'. This means that the original $file parameter will
+        // not be the correct parameter in cases where people use the admin panel with a custom
+        // path like "/admin/{userUUID}/".
+//        $file = request()->file ?? $file;
+
         switch ($file) {
             case 'app.css':
                 return $this->pretendResponseIsFile(__DIR__ . '/../../../dist/app.css', 'text/css; charset=utf-8');

From b3c4a527352606be4d290125eb615a0ae1298e52 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Wed, 9 Feb 2022 11:07:38 +0100
Subject: [PATCH 02/16] Undo comment out

---
 packages/admin/src/Http/Controllers/AssetController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/admin/src/Http/Controllers/AssetController.php b/packages/admin/src/Http/Controllers/AssetController.php
index 96b03c3d9ab..b9eba9f76d5 100644
--- a/packages/admin/src/Http/Controllers/AssetController.php
+++ b/packages/admin/src/Http/Controllers/AssetController.php
@@ -13,7 +13,7 @@ public function __invoke(string $file)
         // and not the parameter named 'file'. This means that the original $file parameter will
         // not be the correct parameter in cases where people use the admin panel with a custom
         // path like "/admin/{userUUID}/".
-//        $file = request()->file ?? $file;
+        $file = request()->file ?? $file;
 
         switch ($file) {
             case 'app.css':

From 07733b23c25ed332d0c4915313047605582601dc Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Thu, 10 Feb 2022 14:19:47 +0100
Subject: [PATCH 03/16] Move asset path to separate path

---
 packages/admin/config/filament.php | 14 +++++++++
 packages/admin/routes/web.php      | 46 ++++++++++++++++--------------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/packages/admin/config/filament.php b/packages/admin/config/filament.php
index 56d6da828a1..f2852b85a71 100644
--- a/packages/admin/config/filament.php
+++ b/packages/admin/config/filament.php
@@ -28,6 +28,20 @@
 
     'path' => env('FILAMENT_PATH', 'admin'),
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | Filament Asset Path
+    |--------------------------------------------------------------------------
+    |
+    | This is the path which Filament will use to load it's assets. Default is
+    | `_filament`, but you may change it if it conflicts with your other routes.
+    |
+    */
+
+    'asset_path' => env('FILAMENT_PATH', '_filament'),
+
+
     /*
     |--------------------------------------------------------------------------
     | Filament Domain
diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 591990eb243..68d71c1345a 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -8,34 +8,36 @@
 Route::domain(config('filament.domain'))
     ->middleware(config('filament.middleware.base'))
     ->name('filament.')
-    ->prefix(config('filament.path'))
     ->group(function () {
-        if ($loginPage = config('filament.auth.pages.login')) {
-            Route::get('/login', $loginPage)->name('auth.login');
-        }
 
-        Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->name('asset');
+        Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
 
-        Route::middleware(config('filament.middleware.auth'))->group(function (): void {
-            Route::name('pages.')->group(function (): void {
-                foreach (Filament::getPages() as $page) {
-                    Route::group([], $page::getRoutes());
-                }
-            });
+        Route::prefix(config('filament.path'))->group(function() {
+            if ($loginPage = config('filament.auth.pages.login')) {
+                Route::get('/login', $loginPage)->name('auth.login');
+            }
 
-            Route::name('resources.')->group(function (): void {
-                foreach (Filament::getResources() as $resource) {
-                    Route::group([], $resource::getRoutes());
-                }
-            });
+            Route::middleware(config('filament.middleware.auth'))->group(function (): void {
+                Route::name('pages.')->group(function (): void {
+                    foreach (Filament::getPages() as $page) {
+                        Route::group([], $page::getRoutes());
+                    }
+                });
 
-            Route::get('/logout', function (): RedirectResponse {
-                Filament::auth()->logout();
+                Route::name('resources.')->group(function (): void {
+                    foreach (Filament::getResources() as $resource) {
+                        Route::group([], $resource::getRoutes());
+                    }
+                });
 
-                session()->invalidate();
-                session()->regenerateToken();
+                Route::get('/logout', function (): RedirectResponse {
+                    Filament::auth()->logout();
 
-                return redirect()->route('filament.auth.login');
-            })->name('auth.logout');
+                    session()->invalidate();
+                    session()->regenerateToken();
+
+                    return redirect()->route('filament.auth.login');
+                })->name('auth.logout');
+            });
         });
     });

From 5a3642f5b464445f12c40e685c9d57b961c2dc6d Mon Sep 17 00:00:00 2001
From: ralphjsmit <ralphjsmit@users.noreply.github.com>
Date: Thu, 10 Feb 2022 13:20:15 +0000
Subject: [PATCH 04/16] chore: styling

---
 packages/admin/routes/web.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 68d71c1345a..35049dd42e8 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -9,10 +9,9 @@
     ->middleware(config('filament.middleware.base'))
     ->name('filament.')
     ->group(function () {
-
         Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
 
-        Route::prefix(config('filament.path'))->group(function() {
+        Route::prefix(config('filament.path'))->group(function () {
             if ($loginPage = config('filament.auth.pages.login')) {
                 Route::get('/login', $loginPage)->name('auth.login');
             }

From fc7448b7889a0331033e2f7e6aac0d354bf91e80 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Thu, 10 Feb 2022 15:55:40 +0100
Subject: [PATCH 05/16] Move authentication routes outside of admin panel path

---
 packages/admin/routes/web.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 35049dd42e8..74dfb643b4f 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -11,10 +11,20 @@
     ->group(function () {
         Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
 
+        if ($loginPage = config('filament.auth.pages.login')) {
+            Route::get('/login', $loginPage)->name('auth.login');
+        }
+
+        Route::get('/logout', function (): RedirectResponse {
+            Filament::auth()->logout();
+
+            session()->invalidate();
+            session()->regenerateToken();
+
+            return redirect()->route('filament.auth.login');
+        })->name('auth.logout');
+
         Route::prefix(config('filament.path'))->group(function () {
-            if ($loginPage = config('filament.auth.pages.login')) {
-                Route::get('/login', $loginPage)->name('auth.login');
-            }
 
             Route::middleware(config('filament.middleware.auth'))->group(function (): void {
                 Route::name('pages.')->group(function (): void {
@@ -28,15 +38,6 @@
                         Route::group([], $resource::getRoutes());
                     }
                 });
-
-                Route::get('/logout', function (): RedirectResponse {
-                    Filament::auth()->logout();
-
-                    session()->invalidate();
-                    session()->regenerateToken();
-
-                    return redirect()->route('filament.auth.login');
-                })->name('auth.logout');
             });
         });
     });

From 00e33d84fc59b6b904406e80684923e074815f08 Mon Sep 17 00:00:00 2001
From: ralphjsmit <ralphjsmit@users.noreply.github.com>
Date: Thu, 10 Feb 2022 14:56:14 +0000
Subject: [PATCH 06/16] chore: styling

---
 packages/admin/routes/web.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 74dfb643b4f..510c69b6d86 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -25,7 +25,6 @@
         })->name('auth.logout');
 
         Route::prefix(config('filament.path'))->group(function () {
-
             Route::middleware(config('filament.middleware.auth'))->group(function (): void {
                 Route::name('pages.')->group(function (): void {
                     foreach (Filament::getPages() as $page) {

From f6ec3cd850dc2ed76e9d096af0b13fee89425b5b Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Fri, 11 Feb 2022 14:49:56 +0100
Subject: [PATCH 07/16] Update requested changes

---
 packages/admin/routes/web.php                 | 23 +++++++++++--------
 .../src/Http/Controllers/AssetController.php  |  6 -----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 510c69b6d86..e740684d07b 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -9,22 +9,25 @@
     ->middleware(config('filament.middleware.base'))
     ->name('filament.')
     ->group(function () {
-        Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
 
-        if ($loginPage = config('filament.auth.pages.login')) {
-            Route::get('/login', $loginPage)->name('auth.login');
-        }
+        Route::prefix(config('filament.asset_path'))->group(function() {
+            Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
 
-        Route::get('/logout', function (): RedirectResponse {
-            Filament::auth()->logout();
+            Route::get('/logout', function (): RedirectResponse {
+                Filament::auth()->logout();
 
-            session()->invalidate();
-            session()->regenerateToken();
+                session()->invalidate();
+                session()->regenerateToken();
 
-            return redirect()->route('filament.auth.login');
-        })->name('auth.logout');
+                return redirect()->route('filament.auth.login');
+            })->name('auth.logout');
+        });
 
         Route::prefix(config('filament.path'))->group(function () {
+            if ($loginPage = config('filament.auth.pages.login')) {
+                Route::get('/login', $loginPage)->name('auth.login');
+            }
+
             Route::middleware(config('filament.middleware.auth'))->group(function (): void {
                 Route::name('pages.')->group(function (): void {
                     foreach (Filament::getPages() as $page) {
diff --git a/packages/admin/src/Http/Controllers/AssetController.php b/packages/admin/src/Http/Controllers/AssetController.php
index b9eba9f76d5..597a6ba0187 100644
--- a/packages/admin/src/Http/Controllers/AssetController.php
+++ b/packages/admin/src/Http/Controllers/AssetController.php
@@ -9,12 +9,6 @@ class AssetController
 {
     public function __invoke(string $file)
     {
-        // The first argument to __invoke will be the first parameter in the complete route,
-        // and not the parameter named 'file'. This means that the original $file parameter will
-        // not be the correct parameter in cases where people use the admin panel with a custom
-        // path like "/admin/{userUUID}/".
-        $file = request()->file ?? $file;
-
         switch ($file) {
             case 'app.css':
                 return $this->pretendResponseIsFile(__DIR__ . '/../../../dist/app.css', 'text/css; charset=utf-8');

From 2a4193e0042acf56f36586510008ad5325da0b65 Mon Sep 17 00:00:00 2001
From: ralphjsmit <ralphjsmit@users.noreply.github.com>
Date: Fri, 11 Feb 2022 13:50:23 +0000
Subject: [PATCH 08/16] chore: styling

---
 packages/admin/routes/web.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index e740684d07b..e91f822d6a5 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -9,8 +9,7 @@
     ->middleware(config('filament.middleware.base'))
     ->name('filament.')
     ->group(function () {
-
-        Route::prefix(config('filament.asset_path'))->group(function() {
+        Route::prefix(config('filament.asset_path'))->group(function () {
             Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
 
             Route::get('/logout', function (): RedirectResponse {

From 552cdbc1a60472b94e83fc2f0eda2af1355252f5 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Fri, 11 Feb 2022 14:55:29 +0100
Subject: [PATCH 09/16] Logout: redirect to login page if set or to Filament
 path if not set

---
 packages/admin/routes/web.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index e740684d07b..b2ba1c26a6b 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -19,7 +19,9 @@
                 session()->invalidate();
                 session()->regenerateToken();
 
-                return redirect()->route('filament.auth.login');
+                return redirect()->to(
+                    config('filament.auth.pages.login') ? route('filament.auth.login') : config('filament.path')
+                );
             })->name('auth.logout');
         });
 

From 56806c033a8ce2e8ed88b94396c3b4e4ca46c9b6 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Sat, 12 Feb 2022 13:00:41 +0100
Subject: [PATCH 10/16] Remove accidental duplicate prefix

---
 packages/admin/routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 0d9e063e147..6e1485e8da4 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -10,7 +10,7 @@
     ->name('filament.')
     ->group(function () {
         Route::prefix(config('filament.asset_path'))->group(function () {
-            Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->prefix(config('filament.asset_path'))->name('asset');
+            Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->name('asset');
 
             Route::get('/logout', function (): RedirectResponse {
                 Filament::auth()->logout();

From b170fe919e6306cc9db9136762dc15ad66717174 Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Sat, 12 Feb 2022 13:01:54 +0100
Subject: [PATCH 11/16] Remove leading `_` on asset path, update .env key

---
 packages/admin/config/filament.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/admin/config/filament.php b/packages/admin/config/filament.php
index f2852b85a71..385788c1024 100644
--- a/packages/admin/config/filament.php
+++ b/packages/admin/config/filament.php
@@ -35,11 +35,11 @@
     |--------------------------------------------------------------------------
     |
     | This is the path which Filament will use to load it's assets. Default is
-    | `_filament`, but you may change it if it conflicts with your other routes.
+    | `filament`, but you may change it if it conflicts with your other routes.
     |
     */
 
-    'asset_path' => env('FILAMENT_PATH', '_filament'),
+    'asset_path' => env('FILAMENT_ASSET_PATH', 'filament'),
 
 
     /*

From ed21d809d47f90ba1f9281e3fcd8daaf83613c7c Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Sat, 12 Feb 2022 13:02:17 +0100
Subject: [PATCH 12/16] Remove unnecessary import

---
 packages/admin/config/filament.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/admin/config/filament.php b/packages/admin/config/filament.php
index 385788c1024..3a9fa8e1c20 100644
--- a/packages/admin/config/filament.php
+++ b/packages/admin/config/filament.php
@@ -4,7 +4,6 @@
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Http\Middleware\MirrorConfigToSubpackages;
 use Filament\Pages;
-use Filament\Resources;
 use Filament\Widgets;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;

From f7602a02fa27643b80115558b7f582c76c7394de Mon Sep 17 00:00:00 2001
From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com>
Date: Mon, 14 Feb 2022 14:34:14 +0100
Subject: [PATCH 13/16] Add AssetController test

---
 composer.json                                 |   1 +
 composer.lock                                 | 279 ++++++++++++------
 .../Http/Controllers/AssetControllerTest.php  |  17 ++
 3 files changed, 207 insertions(+), 90 deletions(-)
 create mode 100644 tests/src/Admin/Http/Controllers/AssetControllerTest.php

diff --git a/composer.json b/composer.json
index f98839b98d2..b439119d635 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,7 @@
         "nunomaduro/larastan": "^1.0",
         "orchestra/testbench": "^6.0|^7.0",
         "pestphp/pest": "^1.17",
+        "pestphp/pest-plugin-laravel": "^1.0",
         "pestphp/pest-plugin-livewire": "^1.0",
         "pestphp/pest-plugin-parallel": "^0.3",
         "phpstan/extension-installer": "^1.1",
diff --git a/composer.lock b/composer.lock
index 1e380fc7ee7..250b10d2c9b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f185f49dcf4b7f886b3c3f2caa961c7e",
+    "content-hash": "3749bc238e02bca1c663403af7e1153b",
     "packages": [],
     "packages-dev": [
         {
@@ -124,16 +124,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.209.20",
+            "version": "3.209.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "77c9c3a6211cb7eae599d5ab8f96765c50c0fa72"
+                "reference": "6082f5df05e5c725a44a310649a922b32bbeec54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/77c9c3a6211cb7eae599d5ab8f96765c50c0fa72",
-                "reference": "77c9c3a6211cb7eae599d5ab8f96765c50c0fa72",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6082f5df05e5c725a44a310649a922b32bbeec54",
+                "reference": "6082f5df05e5c725a44a310649a922b32bbeec54",
                 "shasum": ""
             },
             "require": {
@@ -209,9 +209,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.209.20"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.209.23"
             },
-            "time": "2022-02-08T19:16:05+00:00"
+            "time": "2022-02-11T19:13:32+00:00"
         },
         {
             "name": "blade-ui-kit/blade-heroicons",
@@ -322,12 +322,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "BladeUI\\Icons\\": "src"
-                },
                 "files": [
                     "src/helpers.php"
-                ]
+                ],
+                "psr-4": {
+                    "BladeUI\\Icons\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2273,12 +2273,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2759,16 +2759,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.0.0",
+            "version": "v9.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "fbe7ed828819eadabb3cb9f95847a2ffe8846fd6"
+                "reference": "4c7cd8c4e95d161c0c6ada6efa0a5af4d0d487c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/fbe7ed828819eadabb3cb9f95847a2ffe8846fd6",
-                "reference": "fbe7ed828819eadabb3cb9f95847a2ffe8846fd6",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/4c7cd8c4e95d161c0c6ada6efa0a5af4d0d487c9",
+                "reference": "4c7cd8c4e95d161c0c6ada6efa0a5af4d0d487c9",
                 "shasum": ""
             },
             "require": {
@@ -2934,7 +2934,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-02-08T15:48:31+00:00"
+            "time": "2022-02-10T15:07:46+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2997,16 +2997,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.2.1",
+            "version": "2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a"
+                "reference": "13d7751377732637814f0cda0e3f6d3243f9f769"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a",
-                "reference": "f8afb78f087777b040e0ab8a6b6ca93f6fc3f18a",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/13d7751377732637814f0cda0e3f6d3243f9f769",
+                "reference": "13d7751377732637814f0cda0e3f6d3243f9f769",
                 "shasum": ""
             },
             "require": {
@@ -3097,7 +3097,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-25T14:37:33+00:00"
+            "time": "2022-02-13T15:00:57+00:00"
         },
         {
             "name": "league/config",
@@ -3183,16 +3183,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.0.3",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "9f8b4260031bfef5497477da53dd57b2aaff0e06"
+                "reference": "0c82591fd8950d499612ada7104c5eba3191e200"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9f8b4260031bfef5497477da53dd57b2aaff0e06",
-                "reference": "9f8b4260031bfef5497477da53dd57b2aaff0e06",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0c82591fd8950d499612ada7104c5eba3191e200",
+                "reference": "0c82591fd8950d499612ada7104c5eba3191e200",
                 "shasum": ""
             },
             "require": {
@@ -3215,6 +3215,7 @@
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
+                "microsoft/azure-storage-blob": "^1.1",
                 "phpseclib/phpseclib": "^2.0",
                 "phpstan/phpstan": "^0.12.26",
                 "phpunit/phpunit": "^9.5.11",
@@ -3252,7 +3253,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.0.3"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.0.5"
             },
             "funding": [
                 {
@@ -3268,7 +3269,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-31T19:41:04+00:00"
+            "time": "2022-02-12T19:38:15+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
@@ -3454,16 +3455,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v2.10.1",
+            "version": "v2.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "0d417b27791af09c79108eafd1344842f83a26ee"
+                "reference": "2c4c29dc26b9bf248543ef05c1f820186184baa1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/0d417b27791af09c79108eafd1344842f83a26ee",
-                "reference": "0d417b27791af09c79108eafd1344842f83a26ee",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/2c4c29dc26b9bf248543ef05c1f820186184baa1",
+                "reference": "2c4c29dc26b9bf248543ef05c1f820186184baa1",
                 "shasum": ""
             },
             "require": {
@@ -3515,7 +3516,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v2.10.1"
+                "source": "https://github.com/livewire/livewire/tree/v2.10.2"
             },
             "funding": [
                 {
@@ -3523,7 +3524,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-01-21T13:39:10+00:00"
+            "time": "2022-02-11T21:55:19+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
@@ -3799,12 +3800,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "JmesPath\\": "src/"
-                },
                 "files": [
                     "src/JmesPath.php"
-                ]
+                ],
+                "psr-4": {
+                    "JmesPath\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -4497,23 +4498,23 @@
         },
         {
             "name": "orchestra/testbench",
-            "version": "v7.0.0",
+            "version": "v7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/orchestral/testbench.git",
-                "reference": "fe18fc55119918f05676baab51f80d036b27377b"
+                "reference": "9b0df08ef283ce78e4d40edf20c3b3194a58fd2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/orchestral/testbench/zipball/fe18fc55119918f05676baab51f80d036b27377b",
-                "reference": "fe18fc55119918f05676baab51f80d036b27377b",
+                "url": "https://api.github.com/repos/orchestral/testbench/zipball/9b0df08ef283ce78e4d40edf20c3b3194a58fd2a",
+                "reference": "9b0df08ef283ce78e4d40edf20c3b3194a58fd2a",
                 "shasum": ""
             },
             "require": {
                 "fakerphp/faker": "^1.9.2",
                 "laravel/framework": "^9.0",
                 "mockery/mockery": "^1.4.4",
-                "orchestra/testbench-core": "^7.0",
+                "orchestra/testbench-core": "^7.0.1",
                 "php": "^8.0",
                 "phpunit/phpunit": "^9.5.10",
                 "spatie/laravel-ray": "^1.28",
@@ -4550,7 +4551,7 @@
             ],
             "support": {
                 "issues": "https://github.com/orchestral/testbench/issues",
-                "source": "https://github.com/orchestral/testbench/tree/v7.0.0"
+                "source": "https://github.com/orchestral/testbench/tree/v7.0.1"
             },
             "funding": [
                 {
@@ -4562,20 +4563,20 @@
                     "type": "liberapay"
                 }
             ],
-            "time": "2022-02-08T15:39:22+00:00"
+            "time": "2022-02-14T06:22:02+00:00"
         },
         {
             "name": "orchestra/testbench-core",
-            "version": "v7.0.0",
+            "version": "v7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/orchestral/testbench-core.git",
-                "reference": "3b0ae7a9b39c193ac059024ddf76586c49b45887"
+                "reference": "c28b819c77c5dbf4a94196ffce7dc2ff61a28899"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/3b0ae7a9b39c193ac059024ddf76586c49b45887",
-                "reference": "3b0ae7a9b39c193ac059024ddf76586c49b45887",
+                "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/c28b819c77c5dbf4a94196ffce7dc2ff61a28899",
+                "reference": "c28b819c77c5dbf4a94196ffce7dc2ff61a28899",
                 "shasum": ""
             },
             "require": {
@@ -4654,7 +4655,7 @@
                     "type": "liberapay"
                 }
             ],
-            "time": "2022-02-08T15:26:01+00:00"
+            "time": "2022-02-14T05:57:44+00:00"
         },
         {
             "name": "pestphp/pest",
@@ -4841,6 +4842,76 @@
             ],
             "time": "2021-01-03T15:53:42+00:00"
         },
+        {
+            "name": "pestphp/pest-plugin-laravel",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pestphp/pest-plugin-laravel.git",
+                "reference": "64996218006570f6f58f3c7ebb6f0c7bfb3c60b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pestphp/pest-plugin-laravel/zipball/64996218006570f6f58f3c7ebb6f0c7bfb3c60b9",
+                "reference": "64996218006570f6f58f3c7ebb6f0c7bfb3c60b9",
+                "shasum": ""
+            },
+            "require": {
+                "laravel/framework": "^7.0 || ^8.0 || ^9.0",
+                "pestphp/pest": "^1.7",
+                "php": "^7.3 || ^8.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^5.12.1 || ^6.7.2",
+                "pestphp/pest-dev-tools": "dev-master"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Pest\\Laravel\\": "src/"
+                },
+                "files": [
+                    "src/Autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "The Pest Laravel Plugin",
+            "keywords": [
+                "framework",
+                "laravel",
+                "pest",
+                "php",
+                "test",
+                "testing",
+                "unit"
+            ],
+            "support": {
+                "source": "https://github.com/pestphp/pest-plugin-laravel/tree/v1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/paypalme/enunomaduro",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/nunomaduro",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2022-01-13T17:09:04+00:00"
+        },
         {
             "name": "pestphp/pest-plugin-livewire",
             "version": "v1.0.0",
@@ -4871,12 +4942,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Pest\\Livewire\\": "src/"
-                },
                 "files": [
                     "src/Autoload.php"
-                ]
+                ],
+                "psr-4": {
+                    "Pest\\Livewire\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6643,23 +6714,23 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.8.0",
+            "version": "v2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
+                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
-                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910",
+                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
             },
             "type": "library",
             "autoload": {
@@ -6677,7 +6748,23 @@
             "authors": [
                 {
                     "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com"
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
             "description": "A lightweight implementation of CommonJS Promises/A for PHP",
@@ -6687,9 +6774,19 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v2.8.0"
+                "source": "https://github.com/reactphp/promise/tree/v2.9.0"
             },
-            "time": "2020-05-12T15:16:56+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-11T10:27:51+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -7197,16 +7294,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.3",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
@@ -7249,7 +7346,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
             },
             "funding": [
                 {
@@ -7257,7 +7354,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-11T13:31:12+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -8026,16 +8123,16 @@
         },
         {
             "name": "spatie/laravel-medialibrary",
-            "version": "10.0.4",
+            "version": "10.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-medialibrary.git",
-                "reference": "621d4b9c7e28944cabf993b235a7bb467e5fd784"
+                "reference": "3aa29af0d565412b270f14573c4ae630d7c2721f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/621d4b9c7e28944cabf993b235a7bb467e5fd784",
-                "reference": "621d4b9c7e28944cabf993b235a7bb467e5fd784",
+                "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/3aa29af0d565412b270f14573c4ae630d7c2721f",
+                "reference": "3aa29af0d565412b270f14573c4ae630d7c2721f",
                 "shasum": ""
             },
             "require": {
@@ -8048,9 +8145,7 @@
                 "illuminate/pipeline": "^9.0",
                 "illuminate/support": "^9.0",
                 "intervention/image": "^2.7",
-                "laravel/framework": "9.*",
                 "maennchen/zipstream-php": "^2.0",
-                "orchestra/testbench": "7.*",
                 "php": "^8.0",
                 "spatie/image": "^2.2",
                 "spatie/temporary-directory": "^2.0",
@@ -8069,6 +8164,7 @@
                 "league/flysystem-aws-s3-v3": "^3.0",
                 "mockery/mockery": "^1.4",
                 "nunomaduro/larastan": "^2.0",
+                "orchestra/testbench": "7.*",
                 "pestphp/pest": "^1.20",
                 "phpstan/extension-installer": "^1.1",
                 "spatie/laravel-ray": "^1.28",
@@ -8119,7 +8215,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-medialibrary/issues",
-                "source": "https://github.com/spatie/laravel-medialibrary/tree/10.0.4"
+                "source": "https://github.com/spatie/laravel-medialibrary/tree/10.0.6"
             },
             "funding": [
                 {
@@ -8131,7 +8227,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-09T09:14:08+00:00"
+            "time": "2022-02-11T09:17:57+00:00"
         },
         {
             "name": "spatie/laravel-package-tools",
@@ -8194,16 +8290,16 @@
         },
         {
             "name": "spatie/laravel-ray",
-            "version": "1.29.1",
+            "version": "1.29.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ray.git",
-                "reference": "96e51dfbbb6fe108d6c0430b8a644ec6cf581583"
+                "reference": "6465e1fe7faefdd66aede0952033863181548551"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/96e51dfbbb6fe108d6c0430b8a644ec6cf581583",
-                "reference": "96e51dfbbb6fe108d6c0430b8a644ec6cf581583",
+                "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/6465e1fe7faefdd66aede0952033863181548551",
+                "reference": "6465e1fe7faefdd66aede0952033863181548551",
                 "shasum": ""
             },
             "require": {
@@ -8228,6 +8324,9 @@
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.29.x-dev"
+                },
                 "laravel": {
                     "providers": [
                         "Spatie\\LaravelRay\\RayServiceProvider"
@@ -8259,7 +8358,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-ray/issues",
-                "source": "https://github.com/spatie/laravel-ray/tree/1.29.1"
+                "source": "https://github.com/spatie/laravel-ray/tree/1.29.2"
             },
             "funding": [
                 {
@@ -8271,7 +8370,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2022-02-09T12:59:05+00:00"
+            "time": "2022-02-13T15:39:44+00:00"
         },
         {
             "name": "spatie/laravel-tags",
@@ -10147,12 +10246,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -12414,5 +12513,5 @@
         "php": "^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/tests/src/Admin/Http/Controllers/AssetControllerTest.php b/tests/src/Admin/Http/Controllers/AssetControllerTest.php
new file mode 100644
index 00000000000..372d9c14c82
--- /dev/null
+++ b/tests/src/Admin/Http/Controllers/AssetControllerTest.php
@@ -0,0 +1,17 @@
+<?php
+
+use Filament\Tests\TestCase;
+
+use function Pest\Laravel\get;
+
+uses(TestCase::class);
+
+it('can successfully load the assets', function (string $file) {
+    get(route('filament.asset', ['file' => $file]))
+        ->assertOk();
+})->with([
+    ['app.css'],
+    ['app.css.map'],
+    ['app.js'],
+    ['app.js.map'],
+]);

From 5766ff50359f5d4bc97d533be8fd7c41586e8721 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Thu, 17 Feb 2022 22:10:31 +0000
Subject: [PATCH 14/16] Update AssetControllerTest.php

---
 tests/src/Admin/Http/Controllers/AssetControllerTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/src/Admin/Http/Controllers/AssetControllerTest.php b/tests/src/Admin/Http/Controllers/AssetControllerTest.php
index 372d9c14c82..c8de0c0a21c 100644
--- a/tests/src/Admin/Http/Controllers/AssetControllerTest.php
+++ b/tests/src/Admin/Http/Controllers/AssetControllerTest.php
@@ -7,8 +7,7 @@
 uses(TestCase::class);
 
 it('can successfully load the assets', function (string $file) {
-    get(route('filament.asset', ['file' => $file]))
-        ->assertOk();
+    get(route('filament.asset', ['file' => $file]))->assertOk();
 })->with([
     ['app.css'],
     ['app.css.map'],

From 6c80572bfb5277b8bdd2725797ce7edcf63cd21a Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Thu, 17 Feb 2022 22:16:09 +0000
Subject: [PATCH 15/16] Update filament.php

---
 packages/admin/config/filament.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/admin/config/filament.php b/packages/admin/config/filament.php
index 3a9fa8e1c20..83b5d6afe47 100644
--- a/packages/admin/config/filament.php
+++ b/packages/admin/config/filament.php
@@ -4,6 +4,7 @@
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Http\Middleware\MirrorConfigToSubpackages;
 use Filament\Pages;
+use Filament\Resources;
 use Filament\Widgets;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;
@@ -30,15 +31,15 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Filament Asset Path
+    | Filament Core Path
     |--------------------------------------------------------------------------
     |
-    | This is the path which Filament will use to load it's assets. Default is
-    | `filament`, but you may change it if it conflicts with your other routes.
+    | This is the path which Filament will use to load it's core routes and assets.
+    | You may change it if it conflicts with your other routes.
     |
     */
 
-    'asset_path' => env('FILAMENT_ASSET_PATH', 'filament'),
+    'core_path' => env('FILAMENT_CORE_PATH', 'filament'),
 
 
     /*

From 4935b86125f959f02705ea1e442f5e65665f0258 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Thu, 17 Feb 2022 22:17:09 +0000
Subject: [PATCH 16/16] Update web.php

---
 packages/admin/routes/web.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 6e1485e8da4..ea42e5e1837 100644
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -9,8 +9,8 @@
     ->middleware(config('filament.middleware.base'))
     ->name('filament.')
     ->group(function () {
-        Route::prefix(config('filament.asset_path'))->group(function () {
-            Route::get('/core/assets/{file}', AssetController::class)->where('file', '.*')->name('asset');
+        Route::prefix(config('filament.core_path'))->group(function () {
+            Route::get('/assets/{file}', AssetController::class)->where('file', '.*')->name('asset');
 
             Route::get('/logout', function (): RedirectResponse {
                 Filament::auth()->logout();