Fix JS middlewares ⚒️

resources/js/router/index.js

@@ -90,8 +90,6 @@ async function beforeEach (to, from, next) {
         router.app.setLayout(components[0].layout)
       } else if (components[0].default && components[0].default.layout) {
         router.app.setLayout(components[0].default.layout)
-      } else {
-        router.app.setLayout('')
       }
     }
 
@@ -133,7 +131,10 @@ function callMiddleware (middleware, to, from, next) {
       return next(...args)
     }
 
-    const { middleware, params } = parseMiddleware(stack.pop())
+    const {
+      middleware,
+      params
+    } = parseMiddleware(stack.pop())
 
     if (typeof middleware === 'function') {
       middleware(to, from, _next, params)
@@ -183,7 +184,6 @@ function getMiddleware (components) {
   const middleware = [...globalMiddleware]
 
   components.forEach(component => {
-
     let compMiddleware
     if (component.middleware) {
       compMiddleware = component.middleware
@@ -191,10 +191,12 @@ function getMiddleware (components) {
       compMiddleware = component.default.middleware
     }
 
-    if (Array.isArray(compMiddleware)) {
-      middleware.push(...compMiddleware)
-    } else {
-      middleware.push(compMiddleware)
+    if (compMiddleware) {
+      if (Array.isArray(compMiddleware)) {
+        middleware.push(...compMiddleware)
+      } else {
+        middleware.push(compMiddleware)
+      }
     }
   })
 
@@ -237,7 +239,11 @@ function scrollBehavior (to, from, savedPosition) {
  * @param  {Object} requireContext
  * @return {Object}
  */
-function resolveMiddleware(requireContext) {
+/**
+ * @param  {Object} requireContext
+ * @return {Object}
+ */
+function resolveMiddleware (requireContext) {
   const middlewares = {}
   Object.keys(requireContext)
     .map(file =>