Force redirects with conditions before plain redirects

netlify · Jan 17, 2021 · e9172ad · e9172ad
1 parent cce9b57
commit e9172ad
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/steps/setupRedirects.js b/lib/steps/setupRedirects.js
@@ -52,9 +52,14 @@ const setupRedirects = (publishPath) => {
   // Sort routes: More-specific routes precede less-specific routes (e.g., catch-all)
   const getSortedRedirects = (redirects) => {
     const sortedRoutes = getSortedRoutes(redirects.map(({ route }) => route));
-    return redirects.sort(
-      (a, b) => sortedRoutes.indexOf(a.route) - sortedRoutes.indexOf(b.route)
-    );
+    return redirects.sort((a, b) => {
+      // If routes are different, sort according to Next.js' getSortedRoutes
+      if (a.route !== b.route)
+        return sortedRoutes.indexOf(a.route) - sortedRoutes.indexOf(b.route);
+
+      // Otherwise, put the route with more conditions first
+      return (b.conditions || []).length - (a.conditions || []).length;
+    });
   };
   const sortedStaticRedirects = getSortedRedirects(staticRedirects);
   const sortedDynamicRedirects = getSortedRedirects(dynamicRedirects);