diff --git a/packages/website/package.json b/packages/website/package.json index d1b2b9dc6..5f5f35472 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -40,6 +40,7 @@ "homepage": "https://discord.js.org", "dependencies": { "@discordjs/api-extractor-utils": "workspace:^", + "@discordjs/scripts": "workspace:^", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", "@mantine/core": "^5.2.4", @@ -49,7 +50,6 @@ "@mantine/spotlight": "^5.2.4", "@microsoft/api-extractor-model": "7.23.3", "@microsoft/tsdoc": "0.14.1", - "@microsoft/tsdoc-config": "0.16.1", "@vscode/codicons": "^0.0.32", "minisearch": "^5.0.0", "next": "^12.2.5", diff --git a/packages/website/src/pages/docs/[...slug].tsx b/packages/website/src/pages/docs/[...slug].tsx index 0622da9ae..85ad5b012 100644 --- a/packages/website/src/pages/docs/[...slug].tsx +++ b/packages/website/src/pages/docs/[...slug].tsx @@ -12,6 +12,7 @@ import { type ApiVariableJSON, type ApiEnumJSON, } from '@discordjs/api-extractor-utils'; +import { createApiModel } from '@discordjs/scripts'; import { ActionIcon, Affix, Box, LoadingOverlay, Transition } from '@mantine/core'; import { useMediaQuery, useWindowScroll } from '@mantine/hooks'; import { registerSpotlightActions } from '@mantine/spotlight'; @@ -36,7 +37,6 @@ import { Interface } from '~/components/model/Interface'; import { TypeAlias } from '~/components/model/TypeAlias'; import { Variable } from '~/components/model/Variable'; import { MemberProvider } from '~/contexts/member'; -import { createApiModel } from '~/util/api-model.server'; import { findMember, findMemberByKey } from '~/util/model.server'; import { PACKAGES } from '~/util/packages'; import { miniSearch } from '~/util/search'; diff --git a/packages/website/src/util/api-model.server.ts b/packages/website/src/util/api-model.server.ts deleted file mode 100644 index 3753a0f6a..000000000 --- a/packages/website/src/util/api-model.server.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { ApiModel, ApiItem, type ApiPackage } from '@microsoft/api-extractor-model'; -import { TSDocConfiguration } from '@microsoft/tsdoc'; -import { TSDocConfigFile } from '@microsoft/tsdoc-config'; - -export function createApiModel(data: any) { - const model = new ApiModel(); - const tsdocConfiguration = new TSDocConfiguration(); - const tsdocConfigFile = TSDocConfigFile.loadFromObject(data.metadata.tsdocConfig); - tsdocConfigFile.configureParser(tsdocConfiguration); - - const apiPackage = ApiItem.deserialize(data, { - apiJsonFilename: '', - toolPackage: data.metadata.toolPackage, - toolVersion: data.metadata.toolVersion, - versionToDeserialize: data.metadata.schemaVersion, - tsdocConfiguration, - }) as ApiPackage; - model.addMember(apiPackage); - return model; -} diff --git a/yarn.lock b/yarn.lock index 1fd3a170b..0afaa3434 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1906,7 +1906,7 @@ __metadata: languageName: unknown linkType: soft -"@discordjs/scripts@workspace:packages/scripts": +"@discordjs/scripts@workspace:^, @discordjs/scripts@workspace:packages/scripts": version: 0.0.0-use.local resolution: "@discordjs/scripts@workspace:packages/scripts" dependencies: @@ -1963,6 +1963,7 @@ __metadata: resolution: "@discordjs/website@workspace:packages/website" dependencies: "@discordjs/api-extractor-utils": "workspace:^" + "@discordjs/scripts": "workspace:^" "@emotion/react": ^11.10.4 "@emotion/server": ^11.10.0 "@mantine/core": ^5.2.4 @@ -1972,7 +1973,6 @@ __metadata: "@mantine/spotlight": ^5.2.4 "@microsoft/api-extractor-model": 7.23.3 "@microsoft/tsdoc": 0.14.1 - "@microsoft/tsdoc-config": 0.16.1 "@testing-library/react": ^13.3.0 "@testing-library/user-event": ^14.4.3 "@types/node": ^16.11.56