Skip to content

fix: Windows-rendering of content #5476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ovflowd merged 5 commits into from
Jul 7, 2023
Merged

fix: Windows-rendering of content #5476

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad75be0
fix: Windows-rendering of content
bmuenzenmeyer Jul 6, 2023
fb8be03
Update next.dynamic.mjs
bmuenzenmeyer Jul 6, 2023
b307a39
Merge branch 'main' into main
bmuenzenmeyer Jul 6, 2023
4b172d3
chore: rename variable and add comment
bmuenzenmeyer Jul 6, 2023
bb79b54
Merge branch 'main' of github.com:bmuenzenmeyer/nodejs.org
bmuenzenmeyer Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions next.dynamic.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

import { join } from 'node:path';
import { join, normalize, sep } from 'node:path';
import { readFileSync } from 'node:fs';
import { VFile } from 'vfile';
import remarkGfm from 'remark-gfm';
Expand Down Expand Up @@ -41,10 +41,13 @@ const getAllPaths = async () => {
(locale = '') =>
(files = []) =>
sourcePages.map(filename => {
const path = filename.replace(nextConstants.MD_EXTENSION_REGEX, '');

let path = filename.replace(nextConstants.MD_EXTENSION_REGEX, '');
// remove trailing slash for correct Windows pathing of the index files
if (path.length > 1 && path.endsWith(sep)) {
path = path.substring(0, path.length - 1);
}
return {
pathname: path,
pathname: normalize(path),
filename: filename,
localised: files.includes(filename),
routeWithLocale: `${locale}/${path}`,
Expand Down Expand Up @@ -99,7 +102,7 @@ export const getMarkdownFile = (
// which prevents any malicious attempts to access non-allowed pages
// or other files that do not belong to the `sourcePages`
if (routes && routes.length) {
const route = routes.find(route => route.pathname === pathname);
const route = routes.find(route => route.pathname === normalize(pathname));

if (route && route.filename) {
// this determines if we should be using the fallback rendering to the default locale
Expand Down