fix: next 10.0.6 changed prerender-manifest for i18n (#163)

Author: lindsaylevine

lib/helpers/getPrerenderManifest.js

@@ -14,15 +14,16 @@ const transformManifestForI18n = (manifest) => {
       if (isDynamicRoute) {
         newRoutes[route] = routes[route];
       } else {
-        locales.forEach((locale) => {
-          const routeWithPrependedLocale =
-            route === "/" ? `/${locale}` : `/${locale}${route}`;
-          newRoutes[routeWithPrependedLocale] = {
-            dataRoute: getDataRouteForRoute(route, locale),
-            srcRoute: route,
-            ...params,
-          };
-        });
+        const locale = route.split("/")[1];
+        const routeWithoutLocale = `/${route
+          .split("/")
+          .slice(2, route.split("/").length)
+          .join("/")}`;
+        newRoutes[route] = {
+          dataRoute: getDataRouteForRoute(routeWithoutLocale, locale),
+          srcRoute: routeWithoutLocale,
+          ...params,
+        };
       }
     }
   );

package-lock.json

@@ -44,7 +44,7 @@
     "husky": "^4.3.0",
     "jest": "^26.4.2",
     "netlify-cli": "^2.61.0",
-    "next": "^10.0.3",
+    "next": "^10.0.6",
     "prettier": "2.1.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",

package.json

@@ -0,0 +1,31 @@
+import Link from "next/link";
+
+const Show = ({ show }) => (
+  <div>
+    <p>This page uses getStaticProps() to pre-fetch a TV show.</p>
+
+    <hr />
+
+    <h1>Show #{show.id}</h1>
+    <p>{show.name}</p>
+
+    <hr />
+
+    <Link href="/">
+      <a>Go back home</a>
+    </Link>
+  </div>
+);
+
+export async function getStaticProps(context) {
+  const res = await fetch(`https://api.tvmaze.com/shows/71`);
+  const data = await res.json();
+
+  return {
+    props: {
+      show: data,
+    },
+  };
+}
+
+export default Show;

tests/fixtures/pages-i18n-ssg-index/index.js

@@ -0,0 +1,75 @@
+// Test next-on-netlify when i18n is set in next.config.js (Next 10+)
+
+const { parse, join, sep } = require("path");
+const {
+  existsSync,
+  readdirSync,
+  readFileSync,
+  readJsonSync,
+} = require("fs-extra");
+const buildNextApp = require("./helpers/buildNextApp");
+
+// The name of this test file (without extension)
+const FILENAME = parse(__filename).name;
+
+// The directory which will be used for testing.
+// We simulate a NextJS app within that directory, with pages, and a
+// package.json file.
+const PROJECT_PATH = join(__dirname, "builds", FILENAME);
+
+const DEFAULT_LOCALE = "en";
+
+// Capture the output to verify successful build
+let buildOutput;
+
+beforeAll(
+  async () => {
+    buildOutput = await buildNextApp()
+      .forTest(__filename)
+      .withPages("pages-i18n-ssg-index")
+      .withNextConfig("next.config.js-with-i18n.js")
+      .withPackageJson("package.json")
+      .build();
+  },
+  // time out after 180 seconds
+  180 * 1000
+);
+
+describe("next-on-netlify", () => {
+  test("builds successfully", () => {
+    expect(buildOutput).toMatch("Next on Netlify");
+    expect(buildOutput).toMatch("Success! All done!");
+  });
+});
+
+describe("next-on-netlify", () => {
+  test("builds successfully", () => {
+    expect(buildOutput).toMatch("Next on Netlify");
+    expect(buildOutput).toMatch(
+      `Copying static NextJS assets to out_publish${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Setting up API endpoints as Netlify Functions in out_functions${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Setting up pages with getInitialProps as Netlify Functions in out_functions${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Setting up pages with getServerSideProps as Netlify Functions in out_functions${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Copying pre-rendered pages with getStaticProps and JSON data to out_publish${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Setting up pages with getStaticProps and fallback: true as Netlify Functions in out_functions${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Setting up pages with getStaticProps and revalidation interval as Netlify Functions in out_functions${sep}`
+    );
+    expect(buildOutput).toMatch(
+      `Copying pre-rendered pages without props to out_publish${sep}`
+    );
+    expect(buildOutput).toMatch("Setting up redirects");
+    expect(buildOutput).toMatch("Success! All done!");
+  });
+});