From 2731aac9f464cd298679163b6e7490f5c1b687b9 Mon Sep 17 00:00:00 2001 From: Deep Singhvi Date: Thu, 16 Jan 2025 12:07:44 -0500 Subject: [PATCH] fix(docs): preview server handles both openrpc and openapi (#5629) --- packages/cli/cli/versions.yml | 8 ++++++++ packages/cli/docs-preview/package.json | 2 -- packages/cli/docs-preview/src/previewDocs.ts | 6 ++---- pnpm-lock.yaml | 6 ------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/cli/cli/versions.yml b/packages/cli/cli/versions.yml index d04faa25486..6b639ce4f6b 100644 --- a/packages/cli/cli/versions.yml +++ b/packages/cli/cli/versions.yml @@ -1,3 +1,11 @@ +- changelogEntry: + - summary: | + The preview server is updated such that local previews of both OpenRPC and OpenAPI (legacy parser) + are now possible. + type: fix + irVersion: 55 + version: 0.50.4 + - changelogEntry: - summary: | The docs.yml now supports a separate configurtation for `feature-flags` which allows Fern to render diff --git a/packages/cli/docs-preview/package.json b/packages/cli/docs-preview/package.json index 455e7c94539..31004706f71 100644 --- a/packages/cli/docs-preview/package.json +++ b/packages/cli/docs-preview/package.json @@ -27,12 +27,10 @@ "depcheck": "depcheck" }, "dependencies": { - "@fern-api/core-utils": "workspace:*", "@fern-api/docs-resolver": "workspace:*", "@fern-api/fdr-sdk": "0.128.0-8c361ea2b", "@fern-api/fs-utils": "workspace:*", "@fern-api/ir-sdk": "workspace:*", - "@fern-api/lazy-fern-workspace": "workspace:*", "@fern-api/logger": "workspace:*", "@fern-api/project-loader": "workspace:*", "@fern-api/register": "workspace:*", diff --git a/packages/cli/docs-preview/src/previewDocs.ts b/packages/cli/docs-preview/src/previewDocs.ts index fa640cec919..5982699874e 100644 --- a/packages/cli/docs-preview/src/previewDocs.ts +++ b/packages/cli/docs-preview/src/previewDocs.ts @@ -1,6 +1,5 @@ import { v4 as uuidv4 } from "uuid"; -import { isNonNullish } from "@fern-api/core-utils"; import { DocsDefinitionResolver, filterOssWorkspaces } from "@fern-api/docs-resolver"; import { APIV1Read, @@ -16,7 +15,6 @@ import { } from "@fern-api/fdr-sdk"; import { convertToFernHostAbsoluteFilePath } from "@fern-api/fs-utils"; import { IntermediateRepresentation } from "@fern-api/ir-sdk"; -import { OSSWorkspace } from "@fern-api/lazy-fern-workspace"; import { Project } from "@fern-api/project-loader"; import { convertIrToFdrApi } from "@fern-api/register"; import { TaskContext } from "@fern-api/task-context"; @@ -96,8 +94,8 @@ export async function getPreviewDocsDefinition({ }); return { - apis: parsedDocsConfig.experimental?.openapiParserV2 ? {} : apiCollector.getAPIsForDefinition(), - apisV2: parsedDocsConfig.experimental?.openapiParserV2 ? apiCollectorV2.getAPIsForDefinition() : {}, + apis: apiCollector.getAPIsForDefinition(), + apisV2: apiCollectorV2.getAPIsForDefinition(), config: readDocsConfig, files: {}, filesV2, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1989592180d..1cf9a95dfa0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4952,9 +4952,6 @@ importers: packages/cli/docs-preview: dependencies: - '@fern-api/core-utils': - specifier: workspace:* - version: link:../../commons/core-utils '@fern-api/docs-resolver': specifier: workspace:* version: link:../docs-resolver @@ -4967,9 +4964,6 @@ importers: '@fern-api/ir-sdk': specifier: workspace:* version: link:../../ir-sdk - '@fern-api/lazy-fern-workspace': - specifier: workspace:* - version: link:../workspace/lazy-fern-workspace '@fern-api/logger': specifier: workspace:* version: link:../logger