fix windows test

Author: lindsaylevine

lib/helpers/getPagesManifest.js

@@ -3,7 +3,14 @@ const { readJSONSync } = require("fs-extra");
 const { NEXT_DIST_DIR } = require("../config");
 
 const getPagesManifest = () => {
-  return readJSONSync(join(NEXT_DIST_DIR, "serverless", "pages-manifest.json"));
+  const contents = readJSONSync(
+    join(NEXT_DIST_DIR, "serverless", "pages-manifest.json")
+  );
+  // Next.js mistakenly puts backslashes in certain paths on Windows, replace
+  Object.entries(contents).forEach(([key, value]) => {
+    contents[key] = value.replace(/\\/g, "/");
+  });
+  return contents;
 };
 
 module.exports = getPagesManifest;

lib/pages/getStaticProps/redirects.js

@@ -26,9 +26,10 @@ pages.forEach(({ route, dataRoute, srcRoute }) => {
     const isNotDynamic = !srcRoute;
     if (isNotDynamic) {
       if (defaultLocale) {
+        const defaultLocaleTarget = `/${defaultLocale}${route}`;
         redirects.push({
           route,
-          target: `/${defaultLocale}${route}`,
+          target: defaultLocaleTarget,
         });
       }
       locales.forEach((locale) => {
@@ -49,12 +50,12 @@ pages.forEach(({ route, dataRoute, srcRoute }) => {
       });
     } else {
       if (defaultLocale && !defaultLocaleRedirects.includes(srcRoute)) {
+        const formattedSrcRoute = srcRoute.replace("[", ":").replace("]", "");
+        const defaultLocaleTarget = `/${defaultLocale}${formattedSrcRoute}`;
         // Add redirect for /normal/:id -> /defaultLocale/normal/:id
         redirects.push({
           route: srcRoute,
-          target: `/${defaultLocale}${srcRoute
-            .replace("[", ":")
-            .replace("]", "")}`,
+          target: defaultLocaleTarget,
         });
         defaultLocaleRedirects.push(srcRoute);
       }

tests/i18n.test.js

@@ -1,6 +1,6 @@
 // Test next-on-netlify when i18n is set in next.config.js (Next 10+)
 
-const { parse, join } = require("path");
+const { parse, join, sep } = require("path");
 const {
   existsSync,
   readdirSync,
@@ -45,33 +45,68 @@ describe("next-on-netlify", () => {
 describe("next-on-netlify", () => {
   test("builds successfully", () => {
     expect(buildOutput).toMatch("Next on Netlify");
-    expect(buildOutput).toMatch("Copying static NextJS assets to out_publish/");
     expect(buildOutput).toMatch(
-      "Setting up API endpoints as Netlify Functions in out_functions/"
+      `Copying static NextJS assets to out_publish${sep}`
     );
     expect(buildOutput).toMatch(
-      "Setting up pages with getInitialProps as Netlify Functions in out_functions/"
+      `Setting up API endpoints as Netlify Functions in out_functions${sep}`
     );
     expect(buildOutput).toMatch(
-      "Setting up pages with getServerSideProps as Netlify Functions in out_functions/"
+      `Setting up pages with getInitialProps as Netlify Functions in out_functions${sep}`
     );
     expect(buildOutput).toMatch(
-      "Copying pre-rendered pages with getStaticProps and JSON data to out_publish/"
+      `Setting up pages with getServerSideProps as Netlify Functions in out_functions${sep}`
     );
     expect(buildOutput).toMatch(
-      "Setting up pages with getStaticProps and fallback: true as Netlify Functions in out_functions/"
+      `Copying pre-rendered pages with getStaticProps and JSON data to out_publish${sep}`
     );
     expect(buildOutput).toMatch(
-      "Setting up pages with getStaticProps and revalidation interval as Netlify Functions in out_functions/"
+      `Setting up pages with getStaticProps and fallback: true as Netlify Functions in out_functions${sep}`
     );
     expect(buildOutput).toMatch(
-      "Copying pre-rendered pages without props to out_publish/"
+      `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!");
   });
 });
 
+// describe("next-on-netlify", () => {
+//   test("builds successfully", () => {
+//     expect(buildOutput).toMatch("Next on Netlify");
+//     expect(buildOutput).toMatch(
+//       `Copying public${sep} folder to out_publish${sep}`
+//     );
+//     expect(buildOutput).toMatch("Copying static NextJS assets to out_publish/");
+//     expect(buildOutput).toMatch(
+//       "Setting up API endpoints as Netlify Functions in out_functions/"
+//     );
+//     expect(buildOutput).toMatch(
+//       "Setting up pages with getInitialProps as Netlify Functions in out_functions/"
+//     );
+//     expect(buildOutput).toMatch(
+//       "Setting up pages with getServerSideProps as Netlify Functions in out_functions/"
+//     );
+//     expect(buildOutput).toMatch(
+//       "Copying pre-rendered pages with getStaticProps and JSON data to out_publish/"
+//     );
+//     expect(buildOutput).toMatch(
+//       "Setting up pages with getStaticProps and fallback: true as Netlify Functions in out_functions/"
+//     );
+//     expect(buildOutput).toMatch(
+//       "Setting up pages with getStaticProps and revalidation interval as Netlify Functions in out_functions/"
+//     );
+//     expect(buildOutput).toMatch(
+//       "Copying pre-rendered pages without props to out_publish/"
+//     );
+//     expect(buildOutput).toMatch("Setting up redirects");
+//     expect(buildOutput).toMatch("Success! All done!");
+//   });
+// });
+
 describe("SSR Pages", () => {
   const functionsDir = join(PROJECT_PATH, "out_functions");