Skip to content

Commit 02e0ae8

Browse files
authored
Introduce support for Docusaurus 3.5.0+ (#919)
* upgrade to docusaurus 3.5.2 * refactor imports and add plugin-content-docs declaration * add module mapper for neotraverse/legacy
1 parent 071a66e commit 02e0ae8

File tree

9 files changed

+1020
-1115
lines changed

9 files changed

+1020
-1115
lines changed

demo/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"re-gen": "yarn clean-all && yarn gen-all"
2222
},
2323
"dependencies": {
24-
"@docusaurus/core": "3.4.0",
25-
"@docusaurus/plugin-google-gtag": "3.4.0",
26-
"@docusaurus/preset-classic": "3.4.0",
24+
"@docusaurus/core": "3.5.2",
25+
"@docusaurus/plugin-google-gtag": "3.5.2",
26+
"@docusaurus/preset-classic": "3.5.2",
2727
"clsx": "^1.1.1",
2828
"docusaurus-plugin-openapi-docs": "^3.0.2",
2929
"docusaurus-theme-openapi-docs": "^3.0.2",

jest.config.js

+4
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ module.exports = {
1212
"<rootDir>/packages/docusaurus-plugin-openapi-docs/src",
1313
"<rootDir>/packages/docusaurus-theme-openapi-docs/src",
1414
],
15+
moduleNameMapper: {
16+
"^neotraverse/legacy$":
17+
"<rootDir>/node_modules/neotraverse/dist/legacy/legacy.cjs",
18+
},
1519
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* ============================================================================
2+
* Copyright (c) Palo Alto Networks
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
* ========================================================================== */
7+
8+
/// <reference types="@docusaurus/theme-classic" />
9+
10+
declare module "@docusaurus/plugin-content-docs/client" {
11+
export function DocProvider({
12+
children,
13+
content,
14+
}: {
15+
children: ReactNode;
16+
content: PropDocContent;
17+
});
18+
}

packages/docusaurus-theme-openapi-docs/src/theme/ApiExplorer/Request/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// @ts-nocheck
99
import React, { useState } from "react";
1010

11-
import { useDoc } from "@docusaurus/theme-common/internal";
11+
import { useDoc } from "@docusaurus/plugin-content-docs/client";
1212
import Accept from "@theme/ApiExplorer/Accept";
1313
import Authorization from "@theme/ApiExplorer/Authorization";
1414
import Body from "@theme/ApiExplorer/Body";
@@ -31,7 +31,7 @@ import { FormProvider, useForm } from "react-hook-form";
3131

3232
import makeRequest from "./makeRequest";
3333

34-
function Request({ item }: { item: NonNullable<ApiItem> }) {
34+
function Request({ item }: { item: ApiItem }) {
3535
const postman = new sdk.Request(item.postman);
3636
const metadata = useDoc();
3737
const { proxy, hide_send_button: hideSendButton } = metadata.frontMatter;

packages/docusaurus-theme-openapi-docs/src/theme/ApiExplorer/Response/index.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
import React from "react";
99

10+
// @ts-ignore
11+
import { useDoc } from "@docusaurus/plugin-content-docs/client";
1012
import { usePrismTheme } from "@docusaurus/theme-common";
11-
import { useDoc } from "@docusaurus/theme-common/internal";
1213
import ApiCodeBlock from "@theme/ApiExplorer/ApiCodeBlock";
1314
import { useTypedDispatch, useTypedSelector } from "@theme/ApiItem/hooks";
1415
import SchemaTabs from "@theme/SchemaTabs";
@@ -38,7 +39,7 @@ function formatXml(xml: string) {
3839
return formatted.substring(1, formatted.length - 3);
3940
}
4041

41-
function Response({ item }: { item: NonNullable<ApiItem> }) {
42+
function Response({ item }: { item: ApiItem }) {
4243
const metadata = useDoc();
4344
const hideSendButton = metadata.frontMatter.hide_send_button;
4445
const prismTheme = usePrismTheme();

packages/docusaurus-theme-openapi-docs/src/theme/ApiItem/Layout/index.tsx

-84
This file was deleted.

packages/docusaurus-theme-openapi-docs/src/theme/ApiItem/Layout/styles.module.css

-17
This file was deleted.

packages/docusaurus-theme-openapi-docs/src/theme/ApiItem/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import React from "react";
1111

1212
import BrowserOnly from "@docusaurus/BrowserOnly";
1313
import ExecutionEnvironment from "@docusaurus/ExecutionEnvironment";
14+
import { DocProvider } from "@docusaurus/plugin-content-docs/client";
1415
import { HtmlClassNameProvider } from "@docusaurus/theme-common";
15-
import { DocProvider } from "@docusaurus/theme-common/internal";
1616
import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
1717
import useIsBrowser from "@docusaurus/useIsBrowser";
1818
import { createAuth } from "@theme/ApiExplorer/Authorization/slice";
1919
import { createPersistanceMiddleware } from "@theme/ApiExplorer/persistanceMiddleware";
20-
import DocItemLayout from "@theme/ApiItem/Layout";
2120
import type { Props } from "@theme/DocItem";
21+
import DocItemLayout from "@theme/DocItem/Layout";
2222
import DocItemMetadata from "@theme/DocItem/Metadata";
2323
import clsx from "clsx";
2424
import { ServerObject } from "docusaurus-plugin-openapi-docs/src/openapi/types";

0 commit comments

Comments
 (0)