nitro-web 0.0.164 → 0.0.165

package/client/app.tsx

@@ -38,6 +38,9 @@ type RouteWithPolicies = Route & {
   [key: string]: true | string | (string | true)[]
 }
 
+let lastRedirectUrl = ''
+let lastRedirectTimesForSameUrl: number[] = []
+
 export async function setupApp(config: Config, storeContainer: StoreContainer, layouts: React.FC<LayoutProps>[]) {
   if (!layouts) throw new Error('layouts are required')
   if (!(window as unknown as { useTracked: unknown }).useTracked) {
@@ -207,7 +210,8 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
             <RouteComponent route={route} config={config} />
           ),
           path: route.path,
-          loader: async () => { // request
+          loader: async ({ request }: { request: Request }) => { // request
+            catchRedirectLoop(request, route.name)
             // wait for container/exposedStoreData to be setup (note that this causes ReactRouter to re-render, but not the page)
             if (!nonce) {
               nonce = true 
@@ -216,7 +220,13 @@ function getRouter({ settings, config }: { settings: Settings, config: Config })
             for (const key of route.middleware) {
               const error = settings.middleware[key](route, exposedStoreData || {})
               if (error && error.redirect) {
-                return redirect(error.redirect)
+                // Redirect() will use the new pathname instead of the current one for values without a pathname causing guard 
+                // redirect loops! We assume these query string redirects are intended to be relative to the current path.
+                if (error.redirect.startsWith('?')) {
+                  return redirect(window.location.pathname + error.redirect)
+                } else {
+                  return redirect(error.redirect)
+                }
               }
             }
             return null
@@ -269,6 +279,22 @@ function scrollbarElement() {
   return document.getElementById('app') // was window.scrollY
 }
 
+function catchRedirectLoop(request: Request, routeName: string) {
+  if (request.url === lastRedirectUrl) {
+    const lastRedirectTime = lastRedirectTimesForSameUrl[lastRedirectTimesForSameUrl.length - 1] || 0
+    lastRedirectUrl = request.url
+    lastRedirectTimesForSameUrl.push(Date.now())
+    if (lastRedirectTimesForSameUrl.length > 5 && (Date.now() < lastRedirectTime + 100)) {
+      throw new Error(
+        `Nitro: A redirect loop has been detected for route '${routeName}'. This ismost likely due to a redirect loop caused by your middleware.`
+      )
+    }
+  } else {
+    lastRedirectUrl = request.url
+    lastRedirectTimesForSameUrl = []
+  }
+}
+
 // ---- Overridable defaults ------------
 
 async function beforeApp(config: Config) {

package/components/partials/element/message.tsx

@@ -115,7 +115,7 @@ export function Message({ className, classNameWrapper, icons: iconsProp, positio
       if (Array.isArray(query[key])) continue
       const rawQueryValue = query[key] as string
       
-      if (rawQueryValue.match(/=$/) && !isFirstRender) {
+      if (rawQueryValue.match(/~$/) && !isFirstRender) {
         // Only show if first render, otherwise skip internal tracking of the message
         continue
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.164",
+  "version": "0.0.165",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",