Skip to content

Commit 88e4cdf

Browse files
committed
more fixes
1 parent f9f2109 commit 88e4cdf

File tree

5 files changed

+32
-29
lines changed

5 files changed

+32
-29
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ lerna-debug.log
2424
/data
2525
/classes
2626
/docs
27+
/versioned_docs
28+
/tmp

docusaurus.config.ts

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ const config: Config = {
4343
{
4444
docs: {
4545
sidebarPath: require.resolve('./sidebars.js'),
46-
exclude: ['ref/**'],
4746
},
4847
theme: {
4948
customCss: require.resolve('./src/css/custom.css'),

plugins/cls-loader/src/components/RefIndex.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default function RefIndex({ options, classes, history }: RefIndexProps) {
8282
<Heading as="h1">Welcome to the Class Reference</Heading>
8383
</header>
8484

85-
<section className="tsd-panel">
85+
{/* <section className="tsd-panel">
8686
<h3 className="tsd-panel-header">Packages</h3>
8787
<div className="tsd-panel-content">
8888
<ul className="tsd-index-list">
@@ -98,7 +98,7 @@ export default function RefIndex({ options, classes, history }: RefIndexProps) {
9898
))}
9999
</ul>
100100
</div>
101-
</section>
101+
</section> */}
102102
</div>
103103

104104
<Footer />

plugins/cls-loader/src/index.ts

+26-23
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import type {
77
PropVersionMetadata,
88
} from "@docusaurus/plugin-content-docs";
99
import { CURRENT_VERSION_NAME } from "@docusaurus/plugin-content-docs/server";
10-
import type { LoadContext, Plugin, PluginContentLoadedActions, RouteConfig } from "@docusaurus/types";
10+
import type {
11+
LoadContext,
12+
Plugin,
13+
PluginContentLoadedActions,
14+
RouteConfig,
15+
} from "@docusaurus/types";
1116
import { DEFAULT_PLUGIN_ID, normalizeUrl } from "@docusaurus/utils";
1217
import { generateJson } from "./plugin/data";
1318
import { extractSidebar } from "./plugin/sidebar";
@@ -80,14 +85,11 @@ export default function clsLoaderPlugin(
8085
const classes = await getClassesFromFolder(
8186
path.join(options.projectRoot, metadata.versionLabel),
8287
metadata.versionPath + "/",
83-
context.generatedFilesDir,
88+
context.generatedFilesDir
8489
);
8590

8691
// Generate sidebars (this runs before the main sidebar is loaded)
87-
const sidebars = extractSidebar(
88-
classes,
89-
options.sortSidebar
90-
);
92+
const sidebars = extractSidebar(classes, options.sortSidebar);
9193

9294
// await fs.promises.writeFile(
9395
// path.join(
@@ -104,6 +106,10 @@ export default function clsLoaderPlugin(
104106
// ),
105107
// `import type { SidebarConfig } from '@docusaurus/plugin-content-docs';\nexport = Array<SidebarConfig>;`
106108
// );
109+
generateClassDocs(
110+
path.join(context.generatedFilesDir, "cls-loader-docs", metadata.versionLabel),
111+
classes
112+
);
107113

108114
return {
109115
...metadata,
@@ -137,7 +143,8 @@ export default function clsLoaderPlugin(
137143
const rootRoutes = await Promise.all(
138144
content.loadedVersions.map(async (loadedVersion) => {
139145
const version = loadedVersion.versionName;
140-
generateClassDocs(actions, path.join(context.siteDir, "docs", version), loadedVersion.classes);
146+
// generateClassDocs(actions, path.join(context.siteDir, "versioned_docs", `version-${loadedVersion.versionLabel}`), loadedVersion.classes);
147+
// generateClassDocs(actions, path.join(context.generatedFilesDir, "cls-loader", version), loadedVersion.classes);
141148

142149
// Define version metadata for all pages. We need to use the same structure as
143150
// "docs" so that we can utilize the same React components.
@@ -203,21 +210,17 @@ export default function clsLoaderPlugin(
203210

204211
const indexPermalink = normalizeUrl([loadedVersion.versionPath]);
205212

206-
if (loadedVersion.classes.length > 1) {
207-
// Only write out the ApiIndex only when we have multiple packages
208-
// otherwise we will have 2 top-level entries in the route entries
209-
routes.push({
210-
path: indexPermalink,
211-
exact: true,
212-
component: path.join(__dirname, "./components/RefIndex.js"),
213-
modules: {
214-
options: optionsData,
215-
classes: classesData,
216-
versionMetadata,
217-
},
218-
sidebar: "ref",
219-
});
220-
}
213+
routes.push({
214+
path: indexPermalink,
215+
exact: true,
216+
component: path.join(__dirname, "./components/RefIndex.js"),
217+
modules: {
218+
options: optionsData,
219+
classes: classesData,
220+
versionMetadata,
221+
},
222+
sidebar: "ref",
223+
});
221224

222225
// console.log("indexPermalink", indexPermalink);
223226
// Wrap in the `DocVersionRoot` component:
@@ -254,4 +257,4 @@ export default function clsLoaderPlugin(
254257
});
255258
},
256259
};
257-
}
260+
}

plugins/cls-loader/src/plugin/classes.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ ${asCode(classDef.Class.code)}
289289
290290
${noCode ? "" : originalCode}
291291
`;
292-
return documentation;
293292
documentation += membersToMarkdown(
294293
classFile,
295294
"Parameters",
@@ -314,10 +313,10 @@ export async function generateDocFile(classFile, folder, mdFile) {
314313
return mdFileFull;
315314
}
316315

317-
export async function generateClassDocs(actions, folder, classes) {
316+
export async function generateClassDocs(folder, classes) {
318317
classes.forEach(async (item) => {
319318
if (item.isPackage) {
320-
generateClassDocs(actions, `${folder}/${item.name}`, item.items);
319+
generateClassDocs(`${folder}/${item.name}`, item.items);
321320
} else {
322321
item.fileContent = await generateDocFile(
323322
item.fullPath,

0 commit comments

Comments
 (0)