chore: does this fix node 10 test

Author: lindsaylevine

src/lib/steps/setupRedirects.js

@@ -71,7 +71,17 @@ const setupRedirects = async (publishPath) => {
   const sortedStaticRedirects = getSortedRedirects(staticRedirects)
   const sortedDynamicRedirects = getSortedRedirects(dynamicRedirects)
 
-  const basePathSortFunc = (a, b) => (a.target.includes(basePath) ? -1 : 1)
+  const basePathSortFunc = (a, b) => {
+    if (a.target.includes(basePath) && b.target.includes(basePath)) {
+      return 0
+    } if (a.target.includes(basePath) && !b.target.includes(basePath)) {
+      return -1
+    // } else if (!a.target.includes(basePath) && b.target.includes(basePath)) {
+    //   return 0
+    } 
+      return 1
+    
+  }
   const allRedirects = hasBasePath
     ? [...sortedStaticRedirects.sort(basePathSortFunc), ...sortedDynamicRedirects.sort(basePathSortFunc)]
     : [...sortedStaticRedirects, ...sortedDynamicRedirects]

src/tests/__snapshots__/basePath.test.js.snap

@@ -2,13 +2,13 @@
 
 exports[`Routing creates Netlify redirects 1`] = `
 "# Next-on-Netlify Redirects
-/getStaticProps/withRevalidate/2  /foo/getStaticProps/withRevalidate/2  301!
-/getStaticProps/withRevalidate/1  /foo/getStaticProps/withRevalidate/1  301!
-/getStaticProps/with-revalidate  /foo/getStaticProps/with-revalidate  301!
-/getServerSideProps/static  /foo/getServerSideProps/static  301!
-/api/static  /foo/api/static  301!
-/api/hello-background  /foo/api/hello-background  301!
 /  /foo  301!
+/api/hello-background  /foo/api/hello-background  301!
+/api/static  /foo/api/static  301!
+/getServerSideProps/static  /foo/getServerSideProps/static  301!
+/getStaticProps/with-revalidate  /foo/getStaticProps/with-revalidate  301!
+/getStaticProps/withRevalidate/1  /foo/getStaticProps/withRevalidate/1  301!
+/getStaticProps/withRevalidate/2  /foo/getStaticProps/withRevalidate/2  301!
 /_next/data/%BUILD_ID%/getServerSideProps/static.json  /.netlify/functions/next_getServerSideProps_static  200
 /_next/data/%BUILD_ID%/getStaticProps/1.json  /.netlify/functions/next_getStaticProps_id  200!  Cookie=__prerender_bypass,__next_preview_data
 /_next/data/%BUILD_ID%/getStaticProps/2.json  /.netlify/functions/next_getStaticProps_id  200!  Cookie=__prerender_bypass,__next_preview_data
@@ -39,17 +39,17 @@ exports[`Routing creates Netlify redirects 1`] = `
 /foo/getStaticProps/withFallbackBlocking/4  /.netlify/functions/next_getStaticProps_withFallbackBlocking_id  200  Cookie=__prerender_bypass,__next_preview_data
 /foo/getStaticProps/withRevalidate/1  /.netlify/functions/next_getStaticProps_withRevalidate_id  200
 /foo/getStaticProps/withRevalidate/2  /.netlify/functions/next_getStaticProps_withRevalidate_id  200
-/shows/:params/*  /foo/shows/:params  301!
-/shows/:id  /foo/shows/:id  301!
-/getStaticProps/withRevalidate/withFallback/:id  /foo/getStaticProps/withRevalidate/withFallback/:id  301!
-/getStaticProps/withFallbackBlocking/:id  /foo/getStaticProps/withFallbackBlocking/:id  301!
-/getStaticProps/withFallback/:slug/*  /foo/getStaticProps/withFallback/:slug  301!
-/getStaticProps/withFallback/:id  /foo/getStaticProps/withFallback/:id  301!
-/getServerSideProps/:id  /foo/getServerSideProps/:id  301!
+/api/shows/:id  /foo/api/shows/:id  301!
+/api/shows/:params/*  /foo/api/shows/:params  301!
 /getServerSideProps/all  /foo/getServerSideProps/all/:[slug]  301!
 /getServerSideProps/all/*  /foo/getServerSideProps/all/:[slug]  301!
-/api/shows/:params/*  /foo/api/shows/:params  301!
-/api/shows/:id  /foo/api/shows/:id  301!
+/getServerSideProps/:id  /foo/getServerSideProps/:id  301!
+/getStaticProps/withFallback/:id  /foo/getStaticProps/withFallback/:id  301!
+/getStaticProps/withFallback/:slug/*  /foo/getStaticProps/withFallback/:slug  301!
+/getStaticProps/withFallbackBlocking/:id  /foo/getStaticProps/withFallbackBlocking/:id  301!
+/getStaticProps/withRevalidate/withFallback/:id  /foo/getStaticProps/withRevalidate/withFallback/:id  301!
+/shows/:id  /foo/shows/:id  301!
+/shows/:params/*  /foo/shows/:params  301!
 /_next/data/%BUILD_ID%/getServerSideProps/all.json  /.netlify/functions/next_getServerSideProps_all_slug  200
 /_next/data/%BUILD_ID%/getServerSideProps/all/*  /.netlify/functions/next_getServerSideProps_all_slug  200
 /_next/data/%BUILD_ID%/getServerSideProps/:id.json  /.netlify/functions/next_getServerSideProps_id  200