MERGE

fern-api · Jul 9, 2024 · 34943ac · 34943ac
2 parents e436edc + 9a450c5
commit 34943ac
Show file tree

Hide file tree

Showing 21 changed files with 209 additions and 233 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/....98.9-3b3a3fe5f-ec323dd942-95367a9b40.zip → ....98.4-bf08716d8-668b36101b-79f9847bfd.zip b/....98.9-3b3a3fe5f-ec323dd942-95367a9b40.zip → ....98.4-bf08716d8-668b36101b-79f9847bfd.zip
diff --git a/packages/cli/configuration/fern/definition/docs.yml b/packages/cli/configuration/fern/definition/docs.yml
@@ -14,7 +14,6 @@ types:
       # navigation
       tabs: optional<map<TabId, TabConfig>>
       versions: optional<list<VersionConfig>>
-      landing-page: optional<PageConfiguration>
       navigation:
         type: optional<NavigationConfig>
         docs: The navigation config is skipped when multiple versions are present.
@@ -164,7 +163,6 @@ types:
   VersionFileConfig:
     properties:
       tabs: optional<map<TabId, TabConfig>>
-      landing-page: optional<PageConfiguration>
       navigation: NavigationConfig
 
   NavigationConfig:
@@ -422,10 +420,6 @@ types:
   SectionConfiguration:
     properties:
       section: string
-      path:
-        type: optional<string>
-        docs: |
-          The relative path to the markdown file that will be displayed when the section is clicked.
       contents: list<NavigationItem>
       collapsed: optional<boolean>
       slug: optional<string>

diff --git a/packages/cli/configuration/package.json b/packages/cli/configuration/package.json
@@ -29,22 +29,20 @@
   },
   "dependencies": {
     "@fern-api/core-utils": "workspace:*",
-    "@fern-api/fdr-sdk": "0.98.9-3b3a3fe5f",
+    "@fern-api/fdr-sdk": "0.98.4-bf08716d8",
     "@fern-api/fs-utils": "workspace:*",
     "@fern-api/task-context": "workspace:*",
     "@fern-fern/fiddle-sdk": "0.0.584",
     "dockerode": "^4.0.2",
     "find-up": "^6.3.0",
     "js-yaml": "^4.1.0",
-    "lodash-es": "^4.17.21",
     "tinycolor2": "^1.6.0",
     "zod": "^3.22.3"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.9",
     "@types/jest": "^29.0.3",
     "@types/js-yaml": "^4.0.8",
-    "@types/lodash-es": "^4.17.12",
     "@types/node": "^18.7.18",
     "@types/tinycolor2": "^1.4.6",
     "depcheck": "^1.4.6",

diff --git a/packages/cli/configuration/src/docs-yml/ParsedDocsConfiguration.ts b/packages/cli/configuration/src/docs-yml/ParsedDocsConfiguration.ts
@@ -12,7 +12,7 @@ export interface ParsedDocsConfiguration {
     pages: Record<RelativeFilePath, string>;
 
     /* navigation */
-    landingPage: DocsNavigationItem.Page | undefined;
+    // tabs?: Record<RelativeFilePath, TabConfig>;
     navigation: DocsNavigationConfiguration;
     navbarLinks: DocsV1Write.NavbarLink[] | undefined;
     footerLinks: DocsV1Write.FooterLink[] | undefined;
@@ -131,7 +131,7 @@ export interface VersionedDocsNavigation {
 }
 
 export interface VersionInfo {
-    landingPage: DocsNavigationItem.Page | undefined;
+    // tabs?: Record<RelativeFilePath, TabConfig>;
     navigation: UntabbedDocsNavigation | TabbedDocsNavigation;
     version: string;
     availability: VersionAvailability | undefined;
@@ -200,7 +200,6 @@ export declare namespace DocsNavigationItem {
         slug: string | undefined;
         hidden: boolean | undefined;
         skipUrlSlug: boolean | undefined;
-        overviewAbsolutePath: AbsoluteFilePath | undefined;
     }
 
     export interface ApiSection {
@@ -211,7 +210,7 @@ export declare namespace DocsNavigationItem {
         audiences: Audiences;
         showErrors: boolean;
         snippetsConfiguration: SnippetsConfiguration | undefined;
-        overviewAbsolutePath: AbsoluteFilePath | undefined;
+        summaryAbsolutePath: AbsoluteFilePath | undefined;
         navigation: ParsedApiReferenceLayoutItem[];
         hidden: boolean | undefined;
         slug: string | undefined;
@@ -256,7 +255,7 @@ export declare namespace ParsedApiReferenceLayoutItem {
         type: "section";
         title: string; // title
         referencedSubpackages: string[]; // subpackage IDs
-        overviewAbsolutePath: AbsoluteFilePath | undefined;
+        summaryAbsolutePath: AbsoluteFilePath | undefined;
         contents: ParsedApiReferenceLayoutItem[];
         slug: string | undefined;
         hidden: boolean | undefined;
@@ -267,7 +266,7 @@ export declare namespace ParsedApiReferenceLayoutItem {
         type: "package";
         title: string | undefined; // defaults to subpackage title
         package: string; // subpackage ID
-        overviewAbsolutePath: AbsoluteFilePath | undefined;
+        summaryAbsolutePath: AbsoluteFilePath | undefined;
         contents: ParsedApiReferenceLayoutItem[];
         slug: string | undefined;
         hidden: boolean | undefined;