remove superfluous getFilePathForRouteWithI18n helper

Author: lindsaylevine

lib/helpers/getFilePathForRoute.js

@@ -1,8 +1,9 @@
 // Return the file for the given route
-const getFilePathForRoute = (route, extension) => {
+const getFilePathForRoute = (route, extension, locale) => {
   // Replace / with /index
   const path = route.replace(/^\/$/, "/index");
 
+  if (locale) return `${locale}${path}.${extension}`;
   return `${path}.${extension}`;
 };
 

lib/helpers/getFilePathForRouteWithI18n.js

@@ -1,6 +1,5 @@
 const { join } = require("path");
 const getFilePathForRoute = require("../../helpers/getFilePathForRoute");
-const getFilePathForRouteWithI18n = require("../../helpers/getFilePathForRouteWithI18n");
 const getDataRouteForRoute = require("../../helpers/getDataRouteForRoute");
 const getNetlifyFunctionName = require("../../helpers/getNetlifyFunctionName");
 const nextConfig = require("../../helpers/getNextConfig")();

lib/pages/getStaticProps/redirects.js

@@ -1,7 +1,6 @@
 const { join } = require("path");
 const { logTitle, logItem } = require("../../helpers/logger");
 const getFilePathForRoute = require("../../helpers/getFilePathForRoute");
-const getFilePathForRouteWithI18n = require("../../helpers/getFilePathForRouteWithI18n");
 const getDataRouteForRoute = require("../../helpers/getDataRouteForRoute");
 const nextConfig = require("../../helpers/getNextConfig")();
 const isRouteWithFallback = require("../../helpers/isRouteWithFallback");
@@ -40,10 +39,10 @@ const setup = ({ functionsPath, publishPath }) => {
         // This path will go from / -> /en or /some/path -> /en/some/path
         const route_ = route === "/" ? "" : route;
 
-        const htmlPath = getFilePathForRouteWithI18n(route_, "html", locale);
+        const htmlPath = getFilePathForRoute(route_, "html", locale);
         setupStaticFileForPage({ inputPath: htmlPath, publishPath });
 
-        const jsonPath = getFilePathForRouteWithI18n(route_, "json", locale);
+        const jsonPath = getFilePathForRoute(route_, "json", locale);
         // The provided dataRoutes (from prerender-manifest) for these page types
         // actually don't include the locale (unclear why Vercel did this)
         // BUT the actual path to the .json files DO include the locale