Skip to content
This repository was archived by the owner on May 10, 2021. It is now read-only.

Commit 6b6147d

Browse files
committed
fix windows test
1 parent 1b4cb5a commit 6b6147d

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

lib/helpers/getPagesManifest.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ const { readJSONSync } = require("fs-extra");
33
const { NEXT_DIST_DIR } = require("../config");
44

55
const getPagesManifest = () => {
6-
return readJSONSync(join(NEXT_DIST_DIR, "serverless", "pages-manifest.json"));
6+
const contents = readJSONSync(
7+
join(NEXT_DIST_DIR, "serverless", "pages-manifest.json")
8+
);
9+
// Next.js mistakenly puts backslashes in certain paths on Windows, replace
10+
Object.entries(contents).forEach(([key, value]) => {
11+
contents[key] = value.replace(/\\/g, "/");
12+
});
13+
return contents;
714
};
815

916
module.exports = getPagesManifest;

lib/pages/getStaticProps/redirects.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ pages.forEach(({ route, dataRoute, srcRoute }) => {
2626
const isNotDynamic = !srcRoute;
2727
if (isNotDynamic) {
2828
if (defaultLocale) {
29+
const defaultLocaleTarget = `/${defaultLocale}${route}`;
2930
redirects.push({
3031
route,
31-
target: `/${defaultLocale}${route}`,
32+
target: defaultLocaleTarget,
3233
});
3334
}
3435
locales.forEach((locale) => {
@@ -49,12 +50,12 @@ pages.forEach(({ route, dataRoute, srcRoute }) => {
4950
});
5051
} else {
5152
if (defaultLocale && !defaultLocaleRedirects.includes(srcRoute)) {
53+
const formattedSrcRoute = srcRoute.replace("[", ":").replace("]", "");
54+
const defaultLocaleTarget = `/${defaultLocale}${formattedSrcRoute}`;
5255
// Add redirect for /normal/:id -> /defaultLocale/normal/:id
5356
redirects.push({
5457
route: srcRoute,
55-
target: `/${defaultLocale}${srcRoute
56-
.replace("[", ":")
57-
.replace("]", "")}`,
58+
target: defaultLocaleTarget,
5859
});
5960
defaultLocaleRedirects.push(srcRoute);
6061
}

0 commit comments

Comments
 (0)