fix page plugin ignoring options.routeBasePath

facebook · Jul 21, 2021 · 1a5b9eb · 1a5b9eb
1 parent cc15ba2
commit 1a5b9eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/docusaurus-plugin-content-pages/src/index.ts b/packages/docusaurus-plugin-content-pages/src/index.ts
@@ -17,6 +17,7 @@ import {
   addTrailingPathSeparator,
   Globby,
   createAbsoluteFilePathMatcher,
+  normalizeUrl,
 } from '@docusaurus/utils';
 import {
   LoadContext,
@@ -124,8 +125,11 @@ export default function pluginContentPages(
 
         const source = path.join(contentPath, relativeSource);
         const aliasedSourcePath = aliasedSitePath(source, siteDir);
-        const pathName = encodePath(fileToPath(relativeSource));
-        const permalink = pathName.replace(/^\//, baseUrl || '');
+        const permalink = normalizeUrl([
+          baseUrl,
+          options.routeBasePath,
+          encodePath(fileToPath(relativeSource)),
+        ]);
         if (isMarkdownSource(relativeSource)) {
           return {
             type: 'mdx',

diff --git a/website/_dogfooding/_pages-tests/page.md → website/_dogfooding/_pages-tests/index.md b/website/_dogfooding/_pages-tests/page.md → website/_dogfooding/_pages-tests/index.md
diff --git a/website/src/pages/tests.md b/website/src/pages/tests.md
@@ -4,4 +4,4 @@ Docusaurus use some extra plugin instances for testing / dogfooding purpose:
 
 - [/tests/docs](/tests/docs)
 - [/tests/blog](/tests/blog)
-- [/tests/pages](/pages) (todo bad link to fix)
+- [/tests/pages](/tests/pages)