Merge branch 'main' into taran/site-proxy-domain

.changeset/chilled-eggs-attack.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Fix missing alternative schemas

.changeset/cyan-experts-shave.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Fix OpenAPI tabs indicator overflow

.changeset/early-singers-train.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Fix XML in code sample

.changeset/famous-points-rest.md

@@ -0,0 +1,6 @@
+---
+'@gitbook/openapi-parser': patch
+'@gitbook/react-openapi': patch
+---
+
+Move filterSelectedOpenAPISchemas to @gitbook/openapi-parser

.changeset/flat-pigs-greet.md

@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Track event when visitor is opening a search result.

.changeset/fluffy-planes-kick.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix favicon not being displayed in Google because `robots.txt` was preventing the indexation of the image route

.changeset/friendly-oranges-clap.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix image resizing when using the proxy feature in a site.

.changeset/giant-carrots-divide.md

@@ -0,0 +1,5 @@
+---
+'gitbook': patch
+---
+
+Add breadcrumbs to search results

.changeset/late-teachers-jump.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Disallow crawling by web-robots of search/ask URLs

.changeset/little-wombats-visit.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Safe parse OpenAPI JSON schema

.changeset/lovely-countries-smoke.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix clicking search results when the site is embedded in an iframe.

.changeset/mighty-rats-love.md

@@ -0,0 +1,6 @@
+---
+'@gitbook/react-openapi': patch
+'gitbook': patch
+---
+
+Fix multiple request examples selector not showing

.changeset/nasty-radios-brake.md

@@ -0,0 +1,6 @@
+---
+'@gitbook/react-openapi': patch
+'gitbook': patch
+---
+
+Add OpenAPI write-only indicator

.changeset/new-rocks-explode.md

@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Support site announcement banner

.changeset/rude-crabs-enjoy.md

@@ -0,0 +1,5 @@
+---
+"gitbook": minor
+---
+
+Track event when clicking announcement banner link.

.changeset/shiny-hats-love.md

@@ -0,0 +1,5 @@
+---
+"gitbook-v2": patch
+---
+
+Use stable site URL data for route rewrite in the middleware

.changeset/six-camels-joke.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix a crash when a page contains a block of an integration that is no longer installed

.changeset/spicy-snails-learn.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Fix flash when loading sites with dark mode as default theme

.changeset/stupid-peaches-work.md

@@ -0,0 +1,6 @@
+---
+"@gitbook/react-openapi": patch
+"gitbook": patch
+---
+
+Fix spec properties rendering and missing keys

.changeset/warm-ducks-check.md

@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Replace $ref with $reference in json-decycle

.changeset/wise-dryers-nail.md

@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Trim the search query to avoid showing a loading state when typing

bun.lock

@@ -262,7 +262,7 @@
   },
   "overrides": {
     "@codemirror/state": "6.4.1",
-    "@gitbook/api": "0.106.0",
+    "@gitbook/api": "0.105.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
   },
@@ -623,7 +623,7 @@
 
     "@fortawesome/fontawesome-svg-core": ["@fortawesome/fontawesome-svg-core@6.6.0", "", { "dependencies": { "@fortawesome/fontawesome-common-types": "6.6.0" } }, "sha512-KHwPkCk6oRT4HADE7smhfsKudt9N/9lm6EJ5BVg0tD1yPA5hht837fB87F8pn15D8JfTqQOjhKTktwmLMiD7Kg=="],
 
-    "@gitbook/api": ["@gitbook/api@0.106.0", "", { "dependencies": { "event-iterator": "^2.0.0", "eventsource-parser": "^3.0.0" } }, "sha512-2qA/w18JwHe2fwR2A45q1pEdCZArxqUloegfNibu0xngDhea+iKTXSBrN94wD6Lwkh7cqBp9MvtxC+YMz3hx1g=="],
+    "@gitbook/api": ["@gitbook/api@0.105.0", "", { "dependencies": { "event-iterator": "^2.0.0", "eventsource-parser": "^3.0.0" } }, "sha512-asM2NzFf+8jG/7FtdxYRE5XiOqPMPZX5hy6egKal/ZcXkjtwWqVEY99Ys+evjg3BJXdb7E1lJoN2QA6PBTKZBQ=="],
 
     "@gitbook/cache-do": ["@gitbook/cache-do@workspace:packages/cache-do"],
 

package.json

@@ -12,7 +12,7 @@
         "@codemirror/state": "6.4.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
-        "@gitbook/api": "0.106.0"
+        "@gitbook/api": "0.105.0"
     },
     "private": true,
     "scripts": {

packages/cache-tags/src/index.ts

@@ -60,7 +60,7 @@ export function getCacheTag(
         | {
               tag: 'computed-document';
               space: string;
-              sourceType: string;
+              integration: string;
           }
         /**
          * All data related to the URL of a content
@@ -84,14 +84,6 @@ export function getCacheTag(
               organization: string;
               openAPISpec: string;
           }
-        /**
-         * All data related to a translation
-         */
-        | {
-              tag: 'translation';
-              organization: string;
-              translationSettings: string;
-          }
 ): string {
     switch (spec.tag) {
         case 'user':
@@ -107,15 +99,13 @@ export function getCacheTag(
         case 'document':
             return `space:${spec.space}:document:${spec.document}`;
         case 'computed-document':
-            return `space:${spec.space}:computed-document:${spec.sourceType}`;
+            return `space:${spec.space}:computed-document:${spec.integration}`;
         case 'site':
             return `site:${spec.site}`;
         case 'integration':
             return `integration:${spec.integration}`;
         case 'openapi':
             return `organization:${spec.organization}:openapi:${spec.openAPISpec}`;
-        case 'translation':
-            return `organization:${spec.organization}:translation:${spec.translationSettings}`;
         default:
             assertNever(spec);
     }
@@ -167,15 +157,6 @@ export function getComputedContentSourceCacheTags(
                         })
                     );
                     break;
-                case 'translation-language':
-                    tags.push(
-                        getCacheTag({
-                            tag: 'translation',
-                            organization: inContext.organizationId,
-                            translationSettings: dependency.ref.translationSettings,
-                        })
-                    );
-                    break;
                 default:
                     // Do not throw for unknown dependency types
                     // as it might mean we are lacking behind the API version
@@ -188,22 +169,18 @@ export function getComputedContentSourceCacheTags(
             getCacheTag({
                 tag: 'computed-document',
                 space: inContext.spaceId,
-                sourceType: source.type,
+                integration: source.integration,
             })
         );
     }
 
     // We invalidate the computed content when a new version of the integration is deployed.
-
-    if (source.type.startsWith('integration:')) {
-        const integration = source.type.split(':')[1];
-        tags.push(
-            getCacheTag({
-                tag: 'integration',
-                integration,
-            })
-        );
-    }
+    tags.push(
+        getCacheTag({
+            tag: 'integration',
+            integration: source.integration,
+        })
+    );
 
     return tags;
 }

packages/colors/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @gitbook/colors
 
-## 0.3.1
-
-### Patch Changes
-
-- fb90eb0: Reduce chroma of first color scale step
-
 ## 0.3.0
 
 ### Minor Changes

packages/colors/package.json

@@ -8,7 +8,7 @@
             "default": "./dist/index.js"
         }
     },
-    "version": "0.3.1",
+    "version": "0.3.0",
     "devDependencies": {
         "typescript": "^5.5.3"
     },

packages/colors/src/transformations.ts

@@ -220,7 +220,7 @@ export function colorScale(
             continue;
         }
 
-        const chromaRatio = index < 8 ? index * 0.05 : 1;
+        const chromaRatio = index < 8 ? (index + 1) * 0.05 : 1;
 
         const shade = {
             L: targetL, // Blend lightness

packages/gitbook-v2/CHANGELOG.md

@@ -1,11 +1,5 @@
 # gitbook-v2
 
-## 0.2.3
-
-### Patch Changes
-
-- 5b2bf82: Use stable site URL data for route rewrite in the middleware
-
 ## 0.2.2
 
 ### Patch Changes

packages/gitbook-v2/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook-v2",
-    "version": "0.2.3",
+    "version": "0.2.2",
     "private": true,
     "dependencies": {
         "next": "^15.2.3",

packages/gitbook-v2/src/middleware.ts

@@ -360,6 +360,9 @@ async function serveWithQueryAPIToken(
  *      URL is taken from the pathname.
  */
 function getSiteURLFromRequest(request: NextRequest): URLWithMode | null {
+    console.log('nextRequestUrl', request.nextUrl.toString());
+    Array.from(request.headers.entries()).forEach(([key, value]) => console.log(key, value));
+
     const xGitbookUrl = request.headers.get('x-gitbook-url');
     if (xGitbookUrl) {
         return {

packages/gitbook/CHANGELOG.md

@@ -1,55 +1,5 @@
 # gitbook
 
-## 0.9.1
-
-### Patch Changes
-
-- fb90eb0: Limit tinted background on bold theme to sites with filled sidebar
-- 7d0b422: Handle grouped OpenAPISchemas
-- Updated dependencies [7d0b422]
-- Updated dependencies [fb90eb0]
-  - @gitbook/react-openapi@1.1.8
-  - @gitbook/colors@0.3.1
-
-## 0.9.0
-
-### Minor Changes
-
-- 77fd393: Track event when visitor is opening a search result.
-- d70d566: Support site announcement banner
-- 77fd393: Track event when clicking announcement banner link.
-
-### Patch Changes
-
-- e84a46a: Fix OpenAPI tabs indicator overflow
-- bc90adb: Fix favicon not being displayed in Google because `robots.txt` was preventing the indexation of the image route
-- 434af90: Fix image resizing when using the proxy feature in a site.
-- c756761: Add breadcrumbs to search results
-- 40e8e69: Disallow crawling by web-robots of search/ask URLs
-- 77fd393: Fix clicking search results when the site is embedded in an iframe.
-- 1505ddb: Fix multiple request examples selector not showing
-- 61db166: Add OpenAPI write-only indicator
-- 6f71da8: Fix padding in schemas
-- fa91eb7: Fix PDF generation when user has dark mode configured.
-- 5b1e01c: Support for x-stability property
-- 57ca4e0: Fix a crash when a page contains a block of an integration that is no longer installed
-- d236bf0: Fix flash when loading sites with dark mode as default theme
-- cd99ed5: Fix spec properties rendering and missing keys
-- 813b2af: Support for x-enumDescriptions and x-gitbook-enum
-- e9fa50d: Trim the search query to avoid showing a loading state when typing
-- Updated dependencies [bd35348]
-- Updated dependencies [ae78fc5]
-- Updated dependencies [7bb37c7]
-- Updated dependencies [373183a]
-- Updated dependencies [1505ddb]
-- Updated dependencies [61db166]
-- Updated dependencies [5b1e01c]
-- Updated dependencies [cd99ed5]
-- Updated dependencies [813b2af]
-- Updated dependencies [a25fded]
-  - @gitbook/react-openapi@1.1.7
-  - @gitbook/openapi-parser@2.1.2
-
 ## 0.8.2
 
 ### Patch Changes

packages/gitbook/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "0.9.1",
+    "version": "0.8.2",
     "private": true,
     "scripts": {
         "dev": "env-cmd --silent -f ../../.env.local next dev",

packages/gitbook/src/components/DocumentView/Hint.tsx

@@ -104,7 +104,7 @@ const HINT_STYLES: {
             '[&_.can-override-text]:text-neutral-strong',
         ],
         container:
-            'bg-info border-info theme-muted-tint:bg-info-solid/2 [html.sidebar-filled.theme-bold.tint_&]:bg-info-solid/2',
+            'bg-info border-info theme-muted-tint:bg-info-solid/2 theme-bold-tint:bg-info-solid/2',
         containerWithHeader: 'border-info-solid bg-info-subtle',
     },
     warning: {

packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPIOperation.tsx

@@ -77,12 +77,7 @@ async function OpenAPIOperationBody(props: BlockProps<AnyOpenAPIOperationsBlock>
                         ancestorBlocks={props.ancestorBlocks}
                         isEstimatedOffscreen={props.isEstimatedOffscreen}
                         context={props.context}
-                        style={tcls([
-                            headingProps.deprecated ? 'line-through' : undefined,
-                            headingProps.deprecated || !!headingProps.stability
-                                ? '[&>div]:mt-0'
-                                : undefined,
-                        ])}
+                        style={headingProps.deprecated ? 'line-through' : undefined}
                         block={{
                             object: 'block',
                             key: `${block.key}-heading`,

packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPISchemas.tsx

@@ -50,7 +50,6 @@ async function OpenAPISchemasBody(props: BlockProps<OpenAPISchemasBlock>) {
     return (
         <BaseOpenAPISchemas
             data={data}
-            grouped={block.data.grouped}
             context={{
                 specUrl,
                 icons: {

packages/gitbook/src/components/DocumentView/OpenAPI/style.css

@@ -20,31 +20,10 @@
     @apply flex flex-col items-start justify-start gap-3;
 }
 
-.openapi-summary-tags {
-    @apply flex flex-row gap-2 mt-[0.75em];
-}
-
-.openapi-deprecated,
-.openapi-stability {
+.openapi-deprecated {
     @apply py-0.5 px-1.5 min-w-[1.625rem] font-normal w-fit justify-center items-center ring-1 ring-inset ring-tint bg-tint rounded text-sm leading-[calc(max(1.20em,1.25rem))] before:!content-none after:!content-none;
 }
 
-.openapi-stability-stable {
-    @apply text-green-600 dark:text-green-300 bg-green-50 dark:bg-green-900/6 ring-green-500/5;
-}
-
-.openapi-stability-alpha {
-    @apply text-amber-700 dark:text-amber-300 bg-amber-50 dark:bg-amber-900/6 ring-amber-500/5;
-}
-
-.openapi-stability-beta {
-    @apply text-blue-700 dark:text-blue-300 bg-blue-50 dark:bg-blue-900/6 ring-blue-500/5;
-}
-
-.openapi-stability-experimental {
-    @apply text-violet-700 dark:text-violet-300 bg-violet-50 dark:bg-violet-900/6 ring-violet-500/5;
-}
-
 .openapi-deprecated-sunset-date {
     @apply font-semibold font-mono truncate;
 }
@@ -152,7 +131,7 @@
 
 /* Schema Structure */
 .openapi-schema-root {
-    /* unstyled */
+    @apply mt-2;
 }
 
 .openapi-schema-properties {
@@ -265,11 +244,7 @@
 
 /* Schema Enum */
 .openapi-schema-enum {
-    @apply flex flex-row text-sm leading-relaxed gap-2 flex-wrap text-tint;
-}
-
-.openapi-schema-enum-list {
-    @apply flex flex-row gap-1.5 items-center;
+    @apply flex flex-row text-sm leading-relaxed flex-wrap text-tint;
 }
 
 .openapi-schema-enum-value {
@@ -680,8 +655,7 @@
     @apply border border-tint-subtle rounded-lg;
 }
 
-.openapi-section-schemas > .openapi-section-body > .openapi-schema-properties > .openapi-schema,
-.openapi-section-schemas > .openapi-section-body > .openapi-schema-root {
+.openapi-section-schemas > .openapi-section-body > .openapi-schema-properties > .openapi-schema {
     @apply p-2.5;
 }
 
@@ -718,7 +692,3 @@
         opacity: 0;
     }
 }
-
-.openapi-copy-button {
-    @apply hover:brightness-95;
-}

packages/gitbook/src/components/DocumentView/Tabs/Tabs.tsx

@@ -12,7 +12,7 @@ export function Tabs(props: BlockProps<DocumentBlockTabs>) {
     const tabs: TabsItem[] = [];
     const tabsBody: React.ReactNode[] = [];
 
-    block.nodes.forEach((tab, index) => {
+    block.nodes.forEach((tab) => {
         tabs.push({
             id: tab.meta?.id ?? tab.key!,
             title: tab.data.title ?? '',
@@ -20,7 +20,6 @@ export function Tabs(props: BlockProps<DocumentBlockTabs>) {
 
         tabsBody.push(
             <Blocks
-                key={tab.key ?? index}
                 nodes={tab.nodes}
                 document={document}
                 ancestorBlocks={[...ancestorBlocks, block, tab]}

packages/gitbook/src/components/Header/Header.tsx

@@ -38,7 +38,7 @@ export function Header(props: { context: GitBookSiteContext; withTopHeader?: boo
 
                 'bg-tint-base/9',
                 'theme-muted:bg-tint-subtle/9',
-                '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle/9',
+                'theme-bold-tint:bg-tint-subtle/9',
                 'theme-gradient:bg-gradient-primary',
                 'theme-gradient-tint:bg-gradient-tint',
                 'contrast-more:bg-tint-base',

packages/gitbook/src/components/PDF/PDFRootLayout.tsx

@@ -1,6 +1,5 @@
 import { CustomizationRootLayout } from '@/components/RootLayout';
 import { defaultCustomization } from '@/lib/utils';
-import { CustomizationThemeMode } from '@gitbook/api';
 import type { GitBookSiteContext, GitBookSpaceContext } from '@v2/lib/context';
 
 /**
@@ -17,7 +16,6 @@ export async function PDFRootLayout(props: {
             customization={
                 'customization' in context ? context.customization : defaultCustomization()
             }
-            forcedTheme={CustomizationThemeMode.Light}
         >
             {children}
         </CustomizationRootLayout>

packages/gitbook/src/components/PageAside/PageAside.tsx

@@ -228,7 +228,7 @@ export function PageAside(props: {
             ) : null}
             <div
                 className={tcls(
-                    'sticky bottom-0 z-10 mt-auto flex flex-col bg-tint-base theme-gradient-tint:bg-gradient-tint theme-gradient:bg-gradient-primary theme-muted:bg-tint-subtle pb-4 page-api-block:xl:max-2xl:hidden page-api-block:xl:max-2xl:pb-0 page-api-block:xl:max-2xl:group-hover/aside:flex [html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle',
+                    'sticky bottom-0 z-10 mt-auto flex flex-col bg-tint-base theme-bold-tint:bg-tint-subtle theme-gradient-tint:bg-gradient-tint theme-gradient:bg-gradient-primary theme-muted:bg-tint-subtle pb-4 page-api-block:xl:max-2xl:hidden page-api-block:xl:max-2xl:pb-0 page-api-block:xl:max-2xl:group-hover/aside:flex',
                     'page-api-block:xl:max-2xl:bg-transparent'
                 )}
             >

packages/gitbook/src/components/PageAside/ScrollSectionsList.tsx

@@ -111,7 +111,7 @@ export function ScrollSectionsList(props: { sections: DocumentSection[] }) {
 
                                 'hover:bg-primary-hover',
                                 'theme-muted:hover:bg-primary-active',
-                                '[html.sidebar-filled.theme-bold.tint_&]:hover:bg-primary-active',
+                                'theme-bold-tint:hover:bg-primary-active',
                                 'theme-gradient:hover:bg-primary-active',
 
                                 'tint:font-semibold',

packages/gitbook/src/components/RootLayout/CustomizationRootLayout.tsx

@@ -153,9 +153,9 @@ export async function CustomizationRootLayout(props: {
             </head>
             <body
                 className={tcls(
-                    '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle',
                     'bg-tint-base',
                     'theme-muted:bg-tint-subtle',
+                    'theme-bold-tint:bg-tint-subtle',
 
                     'theme-gradient:bg-gradient-primary',
                     'theme-gradient-tint:bg-gradient-tint'

packages/gitbook/src/components/SiteSections/SiteSectionList.tsx

@@ -32,7 +32,7 @@ export function SiteSectionList(props: { sections: ClientSiteSections; className
             <nav
                 aria-label="Sections"
                 className={tcls(
-                    '-mx-5 before:contents[] relative border-tint-subtle border-b from-transparent sidebar-filled:to-tint-subtle theme-muted:to-tint-subtle to-tint-base text-sm text-tint before:pointer-events-none before:absolute before:right-2 before:bottom-0 before:left-0 before:h-12 before:bg-gradient-to-b [html.sidebar-filled.theme-bold.tint_&]:to-tint-base [html.sidebar-filled.theme-bold.tint_&]:to-tint-subtle [html.sidebar-filled.theme-muted_&]:to-tint-base',
+                    '-mx-5 before:contents[] relative border-tint-subtle border-b from-transparent sidebar-filled:to-tint-subtle theme-bold-tint:to-tint-subtle theme-muted:to-tint-subtle to-tint-base text-sm text-tint before:pointer-events-none before:absolute before:right-2 before:bottom-0 before:left-0 before:h-12 before:bg-gradient-to-b [html.sidebar-filled.theme-bold.tint_&]:to-tint-base [html.sidebar-filled.theme-muted_&]:to-tint-base',
                     className
                 )}
             >

packages/gitbook/src/components/TableOfContents/PageGroupItem.tsx

@@ -40,7 +40,7 @@ export function PageGroupItem(props: {
                     'bg-tint-base',
                     'sidebar-filled:bg-tint-subtle',
                     'theme-muted:bg-tint-subtle',
-                    '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle',
+                    'theme-bold-tint:bg-tint-subtle',
                     '[html.sidebar-filled.theme-muted_&]:bg-tint-base',
                     '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-base',
                     '[html.sidebar-default.theme-gradient_&]:bg-gradient-primary',

packages/gitbook/src/components/TableOfContents/TableOfContents.tsx

@@ -75,7 +75,7 @@ export function TableOfContents(props: {
 
                     'sidebar-filled:bg-tint-subtle',
                     'theme-muted:bg-tint-subtle',
-                    '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-subtle',
+                    'theme-bold-tint:bg-tint-subtle',
                     '[html.sidebar-filled.theme-muted_&]:bg-tint-base',
                     '[html.sidebar-filled.theme-bold.tint_&]:bg-tint-base',
                     'page-no-toc:!bg-transparent',

packages/gitbook/src/components/TableOfContents/Trademark.tsx

@@ -52,7 +52,7 @@ export function Trademark(props: {
                 'before:to-tint-base',
                 'sidebar-filled:before:to-tint-subtle',
                 'theme-muted:before:to-tint-subtle',
-                '[html.sidebar-filled.theme-bold.tint_&]:before:to-tint-subtle',
+                'theme-bold-tint:before:to-tint-subtle',
                 '[html.sidebar-filled.theme-muted_&]:before:to-tint-base',
                 '[html.sidebar-filled.theme-bold.tint_&]:before:to-tint-base',
                 'page-no-toc:before:!to-transparent'

packages/gitbook/src/components/ThemeToggler/ThemeToggler.tsx

@@ -79,7 +79,7 @@ function ThemeButton(props: {
                 active && [
                     'bg-primary',
                     'theme-muted:bg-primary-hover',
-                    '[html.sidebar-filled.theme-bold.tint_&]:bg-primary-hover',
+                    'theme-bold-tint:bg-primary-hover',
                     'hover:bg-primary',
                     'text-primary-strong',
                     'contrast-more:text-primary-strong',

packages/openapi-parser/CHANGELOG.md

@@ -1,13 +1,5 @@
 # @gitbook/openapi-parser
 
-## 2.1.2
-
-### Patch Changes
-
-- 7bb37c7: Move filterSelectedOpenAPISchemas to @gitbook/openapi-parser
-- 5b1e01c: Support for x-stability property
-- 813b2af: Support for x-enumDescriptions and x-gitbook-enum
-
 ## 2.1.1
 
 ### Patch Changes

packages/openapi-parser/package.json

@@ -9,7 +9,7 @@
             "default": "./dist/index.js"
         }
     },
-    "version": "2.1.2",
+    "version": "2.1.1",
     "sideEffects": false,
     "dependencies": {
         "@scalar/openapi-parser": "^0.10.10",

packages/openapi-parser/src/types.ts

@@ -47,31 +47,8 @@ export interface OpenAPICustomOperationProperties {
      * Description in Document format.
      */
     'x-gitbook-description-document'?: object;
-
-    /**
-     * Enums with name and description
-     */
-    'x-enumDescriptions'?: object;
-
-    /**
-     * Enums with name and description
-     */
-    'x-gitbook-enum'?: {
-        [key: string]: {
-            description?: string;
-            name?: string;
-        };
-    };
-
-    /**
-     * Stability of the operation.
-     * @enum 'experimental' | 'alpha' | 'beta' | 'stable'
-     */
-    'x-stability'?: OpenAPIStability;
 }
 
-export type OpenAPIStability = 'experimental' | 'alpha' | 'beta' | 'stable';
-
 /**
  * Custom code samples that can be defined at the operation level.
  * It follows the spec defined by Redocly.

packages/react-openapi/CHANGELOG.md

@@ -1,30 +1,5 @@
 # @gitbook/react-openapi
 
-## 1.1.8
-
-### Patch Changes
-
-- 7d0b422: Handle grouped OpenAPISchemas
-
-## 1.1.7
-
-### Patch Changes
-
-- bd35348: Fix missing alternative schemas
-- ae78fc5: Fix XML in code sample
-- 7bb37c7: Move filterSelectedOpenAPISchemas to @gitbook/openapi-parser
-- 373183a: Safe parse OpenAPI JSON schema
-- 1505ddb: Fix multiple request examples selector not showing
-- 61db166: Add OpenAPI write-only indicator
-- 5b1e01c: Support for x-stability property
-- cd99ed5: Fix spec properties rendering and missing keys
-- 813b2af: Support for x-enumDescriptions and x-gitbook-enum
-- a25fded: Replace $ref with $reference in json-decycle
-- Updated dependencies [7bb37c7]
-- Updated dependencies [5b1e01c]
-- Updated dependencies [813b2af]
-  - @gitbook/openapi-parser@2.1.2
-
 ## 1.1.6
 
 ### Patch Changes

packages/react-openapi/package.json

@@ -8,7 +8,7 @@
             "default": "./dist/index.js"
         }
     },
-    "version": "1.1.8",
+    "version": "1.1.6",
     "sideEffects": false,
     "dependencies": {
         "@gitbook/openapi-parser": "workspace:*",

packages/react-openapi/src/OpenAPICopyButton.tsx

@@ -6,16 +6,10 @@ import { Button, type ButtonProps, Tooltip, TooltipTrigger } from 'react-aria-co
 export function OpenAPICopyButton(
     props: ButtonProps & {
         value: string;
-        children: React.ReactNode;
-        label?: string;
-        /**
-         * Whether to show a tooltip.
-         * @default true
-         */
-        withTooltip?: boolean;
     }
 ) {
-    const { value, label, children, onPress, className, withTooltip = true } = props;
+    const { value } = props;
+    const { children, onPress, className } = props;
     const [copied, setCopied] = useState(false);
     const [isOpen, setIsOpen] = useState(false);
 
@@ -27,19 +21,12 @@ export function OpenAPICopyButton(
 
             setTimeout(() => {
                 setCopied(false);
-                setIsOpen(false);
             }, 2000);
         });
     };
 
     return (
-        <TooltipTrigger
-            isOpen={isOpen}
-            onOpenChange={setIsOpen}
-            isDisabled={!withTooltip}
-            closeDelay={200}
-            delay={200}
-        >
+        <TooltipTrigger isOpen={isOpen} onOpenChange={setIsOpen} closeDelay={200} delay={200}>
             <Button
                 type="button"
                 preventFocusOnPress
@@ -60,7 +47,7 @@ export function OpenAPICopyButton(
                 offset={4}
                 className="openapi-tooltip"
             >
-                {copied ? 'Copied' : label || 'Copy to clipboard'}
+                {copied ? 'Copied' : 'Copy to clipboard'}{' '}
             </Tooltip>
         </TooltipTrigger>
     );

packages/react-openapi/src/OpenAPIOperation.tsx

@@ -1,10 +1,6 @@
 import clsx from 'clsx';
 
-import type {
-    OpenAPICustomOperationProperties,
-    OpenAPIStability,
-    OpenAPIV3,
-} from '@gitbook/openapi-parser';
+import type { OpenAPICustomOperationProperties, OpenAPIV3 } from '@gitbook/openapi-parser';
 import { Markdown } from './Markdown';
 import { OpenAPICodeSample } from './OpenAPICodeSample';
 import { OpenAPIPath } from './OpenAPIPath';
@@ -33,24 +29,14 @@ export function OpenAPIOperation(props: {
     return (
         <div className={clsx('openapi-operation', className)}>
             <div className="openapi-summary" id={operation.summary ? undefined : context.id}>
-                {(operation.deprecated || operation['x-stability']) && (
-                    <div className="openapi-summary-tags">
-                        {operation.deprecated && (
-                            <div className="openapi-deprecated">Deprecated</div>
-                        )}
-                        {operation['x-stability'] && (
-                            <OpenAPIOperationStability stability={operation['x-stability']} />
-                        )}
-                    </div>
-                )}
                 {operation.summary
                     ? context.renderHeading({
                           deprecated: operation.deprecated ?? false,
-                          stability: operation['x-stability'],
                           title: operation.summary,
                       })
                     : null}
                 <OpenAPIPath data={data} context={context} />
+                {operation.deprecated && <div className="openapi-deprecated">Deprecated</div>}
             </div>
             <div className="openapi-columns">
                 <div className="openapi-column-spec">
@@ -103,26 +89,3 @@ function OpenAPIOperationDescription(props: {
         </div>
     );
 }
-
-const stabilityEnum = {
-    experimental: 'Experimental',
-    alpha: 'Alpha',
-    beta: 'Beta',
-    stable: 'Stable',
-} as const;
-
-function OpenAPIOperationStability(props: { stability: OpenAPIStability }) {
-    const { stability } = props;
-
-    const foundStability = stabilityEnum[stability];
-
-    if (!foundStability) {
-        return null;
-    }
-
-    return (
-        <div className={`openapi-stability openapi-stability-${foundStability.toLowerCase()}`}>
-            {foundStability}
-        </div>
-    );
-}

packages/react-openapi/src/OpenAPISchema.tsx

@@ -2,12 +2,11 @@
 // This component does not use any client feature but we don't want to
 // render it server-side because it has recursion.
 
-import type { OpenAPICustomOperationProperties, OpenAPIV3 } from '@gitbook/openapi-parser';
+import type { OpenAPIV3 } from '@gitbook/openapi-parser';
 import { useId } from 'react';
 
 import clsx from 'clsx';
 import { Markdown } from './Markdown';
-import { OpenAPICopyButton } from './OpenAPICopyButton';
 import { OpenAPIDisclosure } from './OpenAPIDisclosure';
 import { OpenAPISchemaName } from './OpenAPISchemaName';
 import { retrocycle } from './decycle';
@@ -237,59 +236,20 @@ function OpenAPISchemaCircularRef(props: { id: string; schema: OpenAPIV3.SchemaO
 /**
  * Render the enum value for a schema.
  */
-function OpenAPISchemaEnum(props: {
-    schema: OpenAPIV3.SchemaObject & OpenAPICustomOperationProperties;
-}) {
-    const { schema } = props;
-
-    const enumValues = (() => {
-        // Render x-gitbook-enum first, as it has a different format
-        if (schema['x-gitbook-enum']) {
-            return Object.entries(schema['x-gitbook-enum']).map(([name, { description }]) => {
-                return {
-                    value: name,
-                    description,
-                };
-            });
-        }
-
-        if (schema['x-enumDescriptions']) {
-            return Object.entries(schema['x-enumDescriptions']).map(([value, description]) => {
-                return {
-                    value,
-                    description,
-                };
-            });
-        }
-
-        return schema.enum?.map((value) => {
-            return {
-                value,
-                description: undefined,
-            };
-        });
-    })();
-
-    if (!enumValues?.length) {
-        return null;
-    }
+function OpenAPISchemaEnum(props: { enumValues: any[] }) {
+    const { enumValues } = props;
 
     return (
         <div className="openapi-schema-enum">
-            <span>Available options:</span>
-            <div className="openapi-schema-enum-list">
-                {enumValues.map((item, index) => (
+            <span>
+                Options:{' '}
+                {enumValues.map((value, index) => (
                     <span key={index} className="openapi-schema-enum-value">
-                        <OpenAPICopyButton
-                            value={item.value}
-                            label={item.description}
-                            withTooltip={!!item.description}
-                        >
-                            <code>{`${item.value}`}</code>
-                        </OpenAPICopyButton>
+                        <code>{`${value}`}</code>
+                        {index < enumValues.length - 1 ? ', ' : ''}
                     </span>
                 ))}
-            </div>
+            </span>
         </div>
     );
 }
@@ -334,7 +294,9 @@ function OpenAPISchemaPresentation(props: { property: OpenAPISchemaPropertyEntry
                     Pattern: <code>{schema.pattern}</code>
                 </div>
             ) : null}
-            <OpenAPISchemaEnum schema={schema} />
+            {schema.enum && schema.enum.length > 0 ? (
+                <OpenAPISchemaEnum enumValues={schema.enum} />
+            ) : null}
         </div>
     );
 }
@@ -459,7 +421,7 @@ function getSchemaTitle(schema: OpenAPIV3.SchemaObject): string {
     // Otherwise try to infer a nice title
     let type = 'any';
 
-    if (schema.enum || schema['x-enumDescriptions'] || schema['x-gitbook-enum']) {
+    if (schema.enum) {
         type = `${schema.type} · enum`;
         // check array AND schema.items as this is sometimes null despite what the type indicates
     } else if (schema.type === 'array' && !!schema.items) {

packages/react-openapi/src/schemas/OpenAPISchemas.tsx

@@ -16,12 +16,8 @@ export function OpenAPISchemas(props: {
     className?: string;
     data: OpenAPISchemasData;
     context: OpenAPISchemasContextProps;
-    /**
-     * Whether to show the schema directly if there is only one.
-     */
-    grouped?: boolean;
 }) {
-    const { className, data, context, grouped } = props;
+    const { className, data, context } = props;
     const { schemas } = data;
 
     const clientContext: OpenAPIClientContext = {
@@ -36,7 +32,7 @@ export function OpenAPISchemas(props: {
 
     return (
         <div className={clsx('openapi-schemas', className)}>
-            <OpenAPIRootSchemasSchema grouped={grouped} schemas={schemas} context={clientContext} />
+            <OpenAPIRootSchemasSchema schemas={schemas} context={clientContext} />
         </div>
     );
 }
@@ -48,12 +44,11 @@ export function OpenAPISchemas(props: {
 function OpenAPIRootSchemasSchema(props: {
     schemas: OpenAPISchemasData['schemas'];
     context: OpenAPIClientContext;
-    grouped?: boolean;
 }) {
-    const { schemas, context, grouped } = props;
+    const { schemas, context } = props;
 
-    // If there is only one model and we are not grouping, we show it directly.
-    if (schemas.length === 1 && !grouped) {
+    // If there is only one model, we show it directly.
+    if (schemas.length === 1) {
         const schema = schemas?.[0]?.schema;
 
         if (!schema) {

packages/react-openapi/src/types.ts

@@ -13,11 +13,7 @@ export interface OpenAPIContextProps extends OpenAPIClientContext {
     /**
      * Render the heading of the operation.
      */
-    renderHeading: (props: {
-        deprecated: boolean;
-        title: string;
-        stability?: string;
-    }) => React.ReactNode;
+    renderHeading: (props: { deprecated: boolean; title: string }) => React.ReactNode;
     /**
      * Render the document of the operation.
      */