From aa3f7db49ad885e68826c086069a070d7070a09b Mon Sep 17 00:00:00 2001 From: 0t4u <61939142+0t4u@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:06:21 +0000 Subject: [PATCH] fix: remove broken workaround --- src/etc/utils.ts | 17 ++--------------- src/index.ts | 6 +++--- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/etc/utils.ts b/src/etc/utils.ts index e125714..65257b3 100644 --- a/src/etc/utils.ts +++ b/src/etc/utils.ts @@ -7,8 +7,8 @@ import path from 'path'; import fs from 'fs-extra'; import semver from 'semver'; -import { version, semanticAlias, versionsOptions, metadata } from '../types'; -import { Application, Logger, TypeDocReader } from 'typedoc'; +import { version, semanticAlias, metadata } from '../types'; +import { Application } from 'typedoc'; const packagePath = path.join(process.cwd(), 'package.json'); const pack = fs.readJSONSync(packagePath); @@ -392,19 +392,6 @@ export function getSymlinkVersion(symlink: string, docRoot: string): version { } } -/** - * Workaround for [#2024](https://github.com/TypeStrong/typedoc/issues/2024) - * @param app - * @returns correctly overridden options - */ -export function getVersionsOptions(app: Application): versionsOptions { - const defaultOpts = app.options.getValue('versions') as versionsOptions; - app.options.addReader(new TypeDocReader()); - app.options.read(new Logger()); - const options = app.options.getValue('versions') as versionsOptions; - return { ...defaultOpts, ...options }; -} - /** * Resolve the root document path and document build path * @param app diff --git a/src/index.ts b/src/index.ts index 3f6a9cf..5806983 100644 --- a/src/index.ts +++ b/src/index.ts @@ -21,17 +21,17 @@ export function load(app: Application) { app.options.addDeclaration({ help: 'Options for typedoc-plugin-versions', name: 'versions', - type: ParameterType.Mixed, + type: ParameterType.Object, defaultValue: { stable: 'auto', dev: 'auto', domLocation: 'false', packageFile: 'package.json', makeRelativeLinks: false, - } as versionsOptions, + }, }); - const vOptions = vUtils.getVersionsOptions(app) as versionsOptions; + const vOptions = app.options.getValue("versions") as versionsOptions; vHooks.injectSelectJs(app); vHooks.injectSelectHtml(app, vOptions.domLocation);