make i18n getDataRoute helper more DRY

Author: lindsaylevine

lib/helpers/getDataRouteForI18nRoute.js

@@ -1,19 +1,8 @@
-const { join } = require("path");
-const { readFileSync } = require("fs-extra");
-const { NEXT_DIST_DIR } = require("../config");
-const getFilePathForRoute = require("./getFilePathForRoute");
+const getDataRouteForRoute = require("./getDataRouteForRoute");
 
-// TO-DO: make more DRY with other getDataRoute helper
-
-// Get build ID that is used for data routes, e.g. /_next/data/BUILD_ID/...
-const fileContents = readFileSync(join(NEXT_DIST_DIR, "BUILD_ID"));
-const buildId = fileContents.toString();
-
-// Return the data route for the given route
+// Return the data route for the given route with the correct locale
 const getDataRouteForI18nRoute = (route, locale) => {
-  const filePath = getFilePathForRoute(route, "json");
-
-  return join("/_next", "data", buildId, locale, filePath);
+  return getDataRouteForRoute(route, locale);
 };
 
 module.exports = getDataRouteForI18nRoute;

lib/helpers/getDataRouteForRoute.js

@@ -8,9 +8,10 @@ const fileContents = readFileSync(join(NEXT_DIST_DIR, "BUILD_ID"));
 const buildId = fileContents.toString();
 
 // Return the data route for the given route
-const getDataRouteForRoute = (route) => {
+const getDataRouteForRoute = (route, locale) => {
   const filePath = getFilePathForRoute(route, "json");
 
+  if (locale) return join("/_next", "data", buildId, locale, filePath);
   return join("/_next", "data", buildId, filePath);
 };