From 2b02667f348fb666c1545234e52039fb65e538c0 Mon Sep 17 00:00:00 2001
From: JhumanJ <julien@nahum.net>
Date: Thu, 26 Jan 2023 12:03:29 +0100
Subject: [PATCH] Fix middlewares

---
 resources/js/router/index.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/js/router/index.js b/resources/js/router/index.js
index 51b3216..9953c0e 100644
--- a/resources/js/router/index.js
+++ b/resources/js/router/index.js
@@ -182,11 +182,19 @@ function resolveComponents (components) {
 function getMiddleware (components) {
   const middleware = [...globalMiddleware]
 
-  components.filter(c => c.middleware).forEach(component => {
-    if (Array.isArray(component.middleware)) {
-      middleware.push(...component.middleware)
+  components.forEach(component => {
+
+    let compMiddleware
+    if (component.middleware) {
+      compMiddleware = component.middleware
+    } else if (component.default && component.default.middleware) {
+      compMiddleware = component.default.middleware
+    }
+
+    if (Array.isArray(compMiddleware)) {
+      middleware.push(...compMiddleware)
     } else {
-      middleware.push(component.middleware)
+      middleware.push(compMiddleware)
     }
   })