update for dataRoutes

Author: lindsaylevine

lib/helpers/getDataRouteForI18nRoute.js

@@ -0,0 +1,19 @@
+const { join } = require("path");
+const { readFileSync } = require("fs-extra");
+const { NEXT_DIST_DIR } = require("../config");
+const getFilePathForRoute = require("./getFilePathForRoute");
+
+// 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
+const getDataRouteForI18nRoute = (route, locale) => {
+  const filePath = getFilePathForRoute(route, "json");
+
+  return join("/_next", "data", buildId, locale, filePath);
+};
+
+module.exports = getDataRouteForI18nRoute;

lib/pages/getStaticProps/setup.js

@@ -1,6 +1,7 @@
 const { join } = require("path");
 const { logTitle, logItem } = require("../../helpers/logger");
 const { NETLIFY_PUBLISH_PATH } = require("../../config");
+const getDataRouteForI18nRoute = require("../../helpers/getDataRouteForI18nRoute");
 const getFilePathForRoute = require("../../helpers/getFilePathForRoute");
 const getFilePathForRouteWithI18n = require("../../helpers/getFilePathForRouteWithI18n");
 const getNextConfig = require("../../helpers/getNextConfig");
@@ -31,30 +32,24 @@ const setup = () => {
       const { locales } = nextConfig.i18n;
       if (!locales || locales.length === 0) return;
 
-      // ok so you dont need to loop over for srcRoutes and do the
-      // set up twice
       const isNotDynamic = !srcRoute;
-      // Dynamic routes dont need special helper, Next auto prepends with locale
-      // in prerender-manifest
+      // Dynamic routes don't need special helper, Next auto prepends with locale
+      // in prerender-manifest, but static routes are missing locale
       if (isNotDynamic) {
         locales.forEach((locale) => {
           // Copy pre-rendered HTML page
-          const htmlPath = getFilePathForRouteWithI18n(route, "html", locale);
+          const route_ = route === "/" ? "" : route;
+          const htmlPath = getFilePathForRouteWithI18n(route_, "html", locale);
           setupStaticFileForPage(htmlPath);
+
+          const jsonPath = getFilePathForRouteWithI18n(route_, "json", locale);
+
+          // the actual route to the json is under pages/{locale}
+          // but the dataRoutes are the same for all locales according to
+          // prerender-manifest..
+          const realJsonDataRoute = getDataRouteForI18nRoute(route, locale);
+          setupStaticFileForPage(jsonPath, realJsonDataRoute);
         });
-        // Copy page's JSON data
-        // TO-DO: get more clarity on dataRoute logic/files;
-        // dataRoute is the same for both/all locales (as is route above)
-        // BUT in setupStaticFileForPage we use the second arg as the outputhPath
-        // (unlike the html pages above where we use the first arg/route as the outputPath)
-        // and its not clear why.. but assuming we only have/need this
-        // one json we dont need to do in the locale loop/for each locale
-        const jsonPath = getFilePathForRouteWithI18n(
-          route,
-          "json",
-          nextConfig.i18n.defaultLocale || locales[0]
-        );
-        setupStaticFileForPage(jsonPath, dataRoute);
       } else {
         // Copy pre-rendered HTML page
         const htmlPath = getFilePathForRoute(route, "html");
@@ -64,6 +59,7 @@ const setup = () => {
         const jsonPath = getFilePathForRoute(route, "json");
         setupStaticFileForPage(jsonPath, dataRoute);
       }
+      // TO-DO combine these conditions
     } else {
       // Copy pre-rendered HTML page
       const htmlPath = getFilePathForRoute(route, "html");