Merge branch 'release'

Author: tgreyuk

.changeset/pretty-rice-jump.md

@@ -0,0 +1,5 @@
+---
+'docusaurus-plugin-typedoc': patch
+---
+
+- Fix sidebar base ids with custom docs path (#802).

devtools/examples/docusaurus-ts/sidebars.ts

@@ -10,7 +10,7 @@ const sidebars: SidebarsConfig = {
         type: 'doc',
         id: 'api/index',
       },
-      items: typedocSidebar,
+      items: typedocSidebar.items,
     },
   ],
 };

devtools/examples/docusaurus/docusaurus.config.js

@@ -61,76 +61,17 @@ const config = {
         entryPoints: [
           '../../../packages/typedoc-plugin-markdown/test/fixtures/src/reflections/index.ts',
         ],
+        out: 'src/docs/api',
       },
     ],
-    [
-      docusaurusPlugin,
-      {
-        id: 'api-2',
-        out: './docs/api-2',
-        ...require(
-          path.join(
-            __dirname,
-            '../../../packages/typedoc-plugin-markdown/test/fixtures/typedoc.cjs',
-          ),
-        ),
-        tsconfig: path.join(
-          __dirname,
-          '../../../packages/typedoc-plugin-markdown/test/fixtures/tsconfig.json',
-        ),
-        entryPoints: [
-          '../../../packages/typedoc-plugin-markdown/test/fixtures/src//packages/*',
-        ],
-        entryPointStrategy: 'packages',
-        cleanOutputDir: true,
-        navigation: {
-          includeFolders: false,
-          includeGroups: false,
-          includeCategories: true,
-        },
-        excludeScopesInPaths: true,
-        sidebar: {
-          pretty: true,
-        },
-      },
-    ],
-    /*[
-      docusaurusPlugin,
-      {
-        id: 'api-3',
-        out: './docs/api-3',
-        ...require(
-          path.join(
-            __dirname,
-            '../../../packages/typedoc-plugin-markdown/test/fixtures/typedoc.cjs',
-          ),
-        ),
-        tsconfig: path.join(
-          __dirname,
-          '../../../packages/typedoc-plugin-markdown/test/fixtures/tsconfig.json',
-        ),
-        entryPoints:
-          '../../../packages/typedoc-plugin-markdown/test/fixtures/src/packages/*',
-        entryPointStrategy: 'packages',
-        cleanOutputDir: true,
-        navigation: {
-          includeFolders: true,
-          includeGroups: true,
-          includeCategories: true,
-        },
-        excludeScopesInPaths: true,
-        sidebar: {
-          pretty: true,
-        },
-      },
-    ],*/
   ],
   presets: [
     [
       'classic',
       /** @type {import('@docusaurus/preset-classic').Options} */
       ({
         docs: {
+          path: 'src/docs',
           sidebarPath: require.resolve('./sidebars.js'),
           sidebarCollapsed: true,
           numberPrefixParser: false,

devtools/examples/docusaurus/sidebars.js

@@ -22,9 +22,9 @@ const sidebars = {
         type: 'doc',
         id: 'api/index',
       },
-      items: require('./docs/api/typedoc-sidebar.cjs'),
+      items: require('./src/docs/api/typedoc-sidebar.cjs'),
     },
-    {
+    /* {
       type: 'category',
       label: 'DOCS 2',
       link: {
@@ -41,7 +41,7 @@ const sidebars = {
         id: 'api-3/index',
       },
       items: require('./docs/api-3/typedoc-sidebar.cjs'),
-    },*/,
+    },*/
   ],
 };
 

docs/content/index.mdx

@@ -11,7 +11,7 @@ import Image from 'next/image';
 <section className="px-4 mx-auto w-full max-w-7xl h-64">
   <div className="flex flex-col gap-14 items-center mt-10">
     <div className="flex flex-col gap-8 justify-center items-center w-full">
-      <span className="text-2xl font-black md:text-4xl text-center">
+      <span className="text-4xl font-black md:text-5xl text-center">
         typedoc-plugin-markdown
       </span>
       <div className="flex md:flex-row items-center text-3xl mt-4">

docs/content/plugins/docusaurus/guides/sidebar.mdx

@@ -52,7 +52,7 @@ const sidebars: SidebarsConfig = {
         type: 'doc',
         id: 'api/index',
       },
-      items: typedocSidebar,
+      items: typedocSidebar.items,
     },
   ],
 };

packages/docusaurus-plugin-typedoc/src/plugin/sidebar.ts

@@ -18,15 +18,10 @@ export function writeSidebar(
       : 'typedoc-sidebar.cjs';
     const sidebarPath = path.resolve(outputDir, sidebarFileName);
 
-    let baseDir = path
-      .relative(siteDir, outputDir)
-      .split(path.sep)
-      .slice(1)
-      .join('/');
-
-    if (docsPresetPath) {
-      baseDir = adjustBaseDirectory(baseDir, docsPresetPath);
-    }
+    const baseDir = adjustBaseDirectory(
+      path.relative(siteDir, outputDir).split(path.sep).join('/'),
+      docsPresetPath || 'docs',
+    );
 
     const sidebarJson = getSidebar(
       navigation,