fix/move fallback i18n logic

Author: lindsaylevine

lib/pages/getStaticProps/pages.js

@@ -4,19 +4,13 @@ const getPrerenderManifest = require("../../helpers/getPrerenderManifest");
 const pages = [];
 
 // Get pages using getStaticProps
-const { routes, dynamicRoutes } = getPrerenderManifest();
-
-const isFallbackRoute = (srcRoute) => {
-  return dynamicRoutes[srcRoute] && !!dynamicRoutes[srcRoute].fallback;
-};
+const { routes } = getPrerenderManifest();
 
 // Parse static pages
 Object.entries(routes).forEach(
   ([route, { dataRoute, initialRevalidateSeconds, srcRoute }]) => {
     // Ignore pages with revalidate, these will need to be SSRed
     if (initialRevalidateSeconds) return;
-    // Exclude routes with fallback, this is handled in getStaticPropsWithFallback
-    if (isFallbackRoute(srcRoute)) return;
 
     pages.push({
       route,

lib/pages/getStaticProps/redirects.js

@@ -3,6 +3,7 @@ const getFilePathForRoute = require("../../helpers/getFilePathForRoute");
 const getDataRouteForRoute = require("../../helpers/getDataRouteForRoute");
 const getNetlifyFunctionName = require("../../helpers/getNetlifyFunctionName");
 const nextConfig = require("../../helpers/getNextConfig")();
+const getPrerenderManifest = require("../../helpers/getPrerenderManifest");
 const pages = require("./pages");
 
 // Pages with getStaticProps (without fallback or revalidation) only need
@@ -27,6 +28,11 @@ const redirects = [];
 const dynamicDefaultLocaleRedirectsAdded = [];
 const dynamicLocaleSrcRoutesAdded = [];
 
+const { dynamicRoutes } = getPrerenderManifest();
+const isFallbackRoute = (srcRoute) => {
+  return dynamicRoutes[srcRoute] && !!dynamicRoutes[srcRoute].fallback;
+};
+
 pages.forEach(({ route, dataRoute, srcRoute }) => {
   const relativePath = getFilePathForRoute(srcRoute || route, "js");
   const filePath = join("pages", relativePath);
@@ -69,9 +75,12 @@ pages.forEach(({ route, dataRoute, srcRoute }) => {
       // i.e. /getStaticProps/23 -> /en/getStaticProps/23
       // BUT we only have to do this *once* per srcRoute (within this pages loop)
       // so we track the srcRoutes we've already added redirects for
+      // Also skip fallback srcRoutes, not needed because getStaticPropsWithFallback
+      // logic will add this redirect
       if (
         defaultLocale &&
-        !dynamicDefaultLocaleRedirectsAdded.includes(srcRoute)
+        !dynamicDefaultLocaleRedirectsAdded.includes(srcRoute) &&
+        !isFallbackRoute(srcRoute)
       ) {
         const formattedSrcRoute = srcRoute.replace("[", ":").replace("]", "");
         const defaultLocaleTarget = `/${defaultLocale}${formattedSrcRoute}`;