Merge branch 'main' into ajiang/navigation-v2

fern-api · May 24, 2024 · 9631973 · 9631973
2 parents 0226a8e + 0a719c4
commit 9631973
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/packages/ui/app/src/api-playground/PlaygroundContext.tsx b/packages/ui/app/src/api-playground/PlaygroundContext.tsx
@@ -50,6 +50,11 @@ export const PLAYGROUND_FORM_STATE_ATOM = atomWithStorage<Record<string, Playgro
     {},
 );
 
+const fetcher = async (url: string) => {
+    const res = await fetch(url);
+    return res.json();
+};
+
 export const PlaygroundContextProvider: FC<PropsWithChildren> = ({ children }) => {
     const { isApiPlaygroundEnabled } = useFeatureFlags();
     const [apis, setApis] = useAtom(APIS);
@@ -58,7 +63,7 @@ export const PlaygroundContextProvider: FC<PropsWithChildren> = ({ children }) =
 
     const key = urljoin(basePath ?? "", "/api/fern-docs/resolve-api");
 
-    const { data } = useSWR<Record<string, ResolvedRootPackage> | null>(key);
+    const { data } = useSWR<Record<string, ResolvedRootPackage> | null>(key, fetcher);
     useEffect(() => {
         if (data != null) {
             setApis(data);

diff --git a/packages/ui/app/src/commons/__test__/__snapshots__/CopyToClipboardButton.test.tsx.snap b/packages/ui/app/src/commons/__test__/__snapshots__/CopyToClipboardButton.test.tsx.snap
@@ -4,10 +4,16 @@ exports[`CopyToClipboardButton > renders correctly 1`] = `
 <button
   aria-disabled={false}
   className="group fern-copy-button fern-button minimal normal rounded square"
-  data-state="off"
+  data-state="closed"
   data-testid="copy-btn"
   disabled={false}
+  onBlur={[Function]}
+  onClick={[Function]}
   onClickCapture={[Function]}
+  onFocus={[Function]}
+  onPointerDown={[Function]}
+  onPointerLeave={[Function]}
+  onPointerMove={[Function]}
   tabIndex={0}
 >
   <span

diff --git a/packages/ui/components/src/FernTooltip.tsx b/packages/ui/components/src/FernTooltip.tsx
@@ -4,7 +4,6 @@ import { FC, ReactNode } from "react";
 
 interface FernTooltipProps extends Tooltip.TooltipProps, Omit<Tooltip.TooltipContentProps, "content"> {
     content: ReactNode | undefined;
-    isReady?: boolean;
 }
 
 export const FernTooltip: FC<FernTooltipProps> = ({
@@ -15,10 +14,9 @@ export const FernTooltip: FC<FernTooltipProps> = ({
     onOpenChange,
     delayDuration,
     disableHoverableContent,
-    isReady,
     ...props
 }) => {
-    if (content == null || content === "" || !isReady) {
+    if (content == null || content === "") {
         return <>{children}</>;
     }
     return (

diff --git a/packages/ui/docs-bundle/next.config.js b/packages/ui/docs-bundle/next.config.js
@@ -1,4 +1,5 @@
-const assetPrefix = process.env.CDN_URI != null ? new URL("/", process.env.CDN_URI).href : undefined;
+const assetPrefix =
+    process.env.NEXT_PUBLIC_CDN_URI != null ? new URL("/", process.env.NEXT_PUBLIC_CDN_URI).href : undefined;
 /** @type {import('next').NextConfig} */
 const nextConfig = {
     reactStrictMode: true,

diff --git a/packages/ui/docs-bundle/sentry.client.config.ts b/packages/ui/docs-bundle/sentry.client.config.ts
@@ -5,7 +5,8 @@
 import * as Sentry from "@sentry/nextjs";
 
 const sentryEnv = process?.env.NEXT_PUBLIC_APPLICATION_ENVIRONMENT ?? "dev";
-const assetPrefix = process.env.CDN_URI != null ? new URL("/", process.env.CDN_URI).href : undefined;
+const assetPrefix =
+    process.env.NEXT_PUBLIC_CDN_URI != null ? new URL("/", process.env.NEXT_PUBLIC_CDN_URI).href : undefined;
 const tunnelPath = "/api/fern-docs/monitoring";
 
 Sentry.init({