Merge branch 'app' into jsklan/weekly-selfhosted-publish

jsklan · jsklan · commit 7773ab581b2d · 2025-09-22T12:15:08.000-04:00
diff --git a/packages/commons/fdr-utils/src/definition-object-factory.ts b/packages/commons/fdr-utils/src/definition-object-factory.ts
@@ -1,4 +1,4 @@
-import { FdrAPI } from "@fern-api/fdr-sdk/client/types";
+import { FdrAPI } from "@fern-api/fdr-sdk";
 
 export class DefinitionObjectFactory {
   public static createDocsDefinition(): FdrAPI.docs.v1.read.DocsDefinition {
diff --git a/packages/commons/fdr-utils/src/docs.ts b/packages/commons/fdr-utils/src/docs.ts
@@ -1,6 +1,6 @@
 import { UnreachableCaseError } from "ts-essentials";
 
-import { DocsV1Read, FdrAPI } from "@fern-api/fdr-sdk/client/types";
+import { DocsV1Read, FdrAPI } from "@fern-api/fdr-sdk";
 import { Availability } from "@fern-api/fdr-sdk/navigation";
 
 export function isVersionedNavigationConfig(
diff --git a/packages/commons/fdr-utils/src/stringifyEndpointPathParts.ts b/packages/commons/fdr-utils/src/stringifyEndpointPathParts.ts
@@ -1,4 +1,4 @@
-import { APIV1Read } from "@fern-api/fdr-sdk/client/types";
+import { APIV1Read } from "@fern-api/fdr-sdk";
 
 export function stringifyEndpointPathParts(
   path: APIV1Read.EndpointPathPart[]
diff --git a/packages/commons/fdr-utils/src/types.ts b/packages/commons/fdr-utils/src/types.ts
@@ -1,4 +1,4 @@
-import type { DocsV1Read } from "@fern-api/fdr-sdk/client/types";
+import type { DocsV1Read } from "@fern-api/fdr-sdk";
 import type * as FernNavigation from "@fern-api/fdr-sdk/navigation";
 
 export interface ColorsConfig {
diff --git a/packages/fdr-sdk/package.json b/packages/fdr-sdk/package.json
@@ -6,42 +6,57 @@
   "exports": {
     "./navigation": {
       "types": "./dist/navigation/index.d.ts",
-      "default": "./dist/navigation/index.js"
+      "import": "./dist/navigation/index.mjs",
+      "require": "./dist/navigation/index.js",
+      "default": "./dist/navigation/index.mjs"
     },
     "./api-definition": {
       "types": "./dist/api-definition/index.d.ts",
-      "default": "./dist/api-definition/index.js"
+      "import": "./dist/api-definition/index.mjs",
+      "require": "./dist/api-definition/index.js",
+      "default": "./dist/api-definition/index.mjs"
     },
     "./docs": {
       "types": "./dist/docs/index.d.ts",
-      "default": "./dist/docs/index.js"
+      "import": "./dist/docs/index.mjs",
+      "require": "./dist/docs/index.js",
+      "default": "./dist/docs/index.mjs"
     },
     "./client": {
       "types": "./dist/client/FdrClient.d.ts",
-      "default": "./dist/client/FdrClient.js"
+      "import": "./dist/client/FdrClient.mjs",
+      "require": "./dist/client/FdrClient.js",
+      "default": "./dist/client/FdrClient.mjs"
     },
     "./client/types": {
       "types": "./dist/client/types.d.ts",
-      "default": "./dist/client/types.js"
+      "import": "./dist/client/types.mjs",
+      "require": "./dist/client/types.js",
+      "default": "./dist/client/types.mjs"
     },
     "./traversers": {
       "types": "./dist/utils/traversers/index.d.ts",
-      "default": "./dist/utils/traversers/index.js"
+      "import": "./dist/utils/traversers/index.mjs",
+      "require": "./dist/utils/traversers/index.js",
+      "default": "./dist/utils/traversers/index.mjs"
     },
     ".": {
       "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "default": "./dist/index.mjs"
     }
   },
-  "main": "dist/index.js",
+  "main": "dist/index.mjs",
   "source": "src/index.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "clean": "rm -rf ./dist && tsc --build --clean",
-    "compile": "tsc --build",
-    "dev": "tsc --watch tsconfig.build.json",
+    "clean": "rm -rf ./dist",
+    "compile": "tsc --build && tsup --clean false",
+    "dev": "tsup --watch",
     "format": "prettier --write --ignore-unknown \"**\"",
     "format:check": "prettier --check --ignore-unknown \"**\"",
     "lint": "eslint --max-warnings 0 src --ext .ts --resolve-plugins-relative-to ../../",
@@ -74,6 +89,7 @@
     "@types/qs": "6.9.14",
     "@types/tinycolor2": "^1.4.6",
     "@types/ungap__structured-clone": "^1.2.0",
+    "tsup": "^8.3.5",
     "typescript": "^5",
     "vitest": "^3.2.4"
   }
diff --git a/packages/fdr-sdk/src/api-definition/snippets/curl.ts b/packages/fdr-sdk/src/api-definition/snippets/curl.ts
@@ -2,13 +2,13 @@ import { compact } from "es-toolkit/array";
 import qs from "qs";
 import { UnreachableCaseError } from "ts-essentials";
 
-import { obfuscateSecret } from "@fern-api/fdr-sdk";
 import {
   isNonNullish,
   isPlainObject,
   unknownToString,
 } from "@fern-api/ui-core-utils";
 
+import { obfuscateSecret } from "../../utils/obfuscate-secret";
 import type * as Latest from "../latest";
 import { wrapOpenRPCRequest } from "../wrapOpenRPCRequest";
 import {
diff --git a/packages/fdr-sdk/src/navigation/versions/v1/converters/ChangelogConverter.ts b/packages/fdr-sdk/src/navigation/versions/v1/converters/ChangelogConverter.ts
@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
+import utc from "dayjs/plugin/utc.js";
 
 import { FernNavigation } from "../../../..";
 import type { DocsV1Read } from "../../../../client/types";
diff --git a/packages/fdr-sdk/src/navigation/versions/v1/converters/__test__/groupByTime.test.ts b/packages/fdr-sdk/src/navigation/versions/v1/converters/__test__/groupByTime.test.ts
@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
+import utc from "dayjs/plugin/utc.js";
 
 import { FernNavigation } from "../../../../..";
 import { groupByMonth, groupByYear } from "../ChangelogConverter";
diff --git a/packages/fdr-sdk/tsconfig.build.json b/packages/fdr-sdk/tsconfig.build.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "declaration": true,
+    "declarationMap": true,
+    "incremental": false,
+    "composite": false
+  },
+  "include": ["./src/**/*.ts"],
+  "exclude": ["node_modules", "dist", "**/*.test.ts", "**/__test__/**"]
+}
diff --git a/packages/fdr-sdk/tsup.config.ts b/packages/fdr-sdk/tsup.config.ts
@@ -0,0 +1,30 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: {
+    index: "src/index.ts",
+    "navigation/index": "src/navigation/index.ts",
+    "api-definition/index": "src/api-definition/index.ts",
+    "docs/index": "src/docs/index.ts",
+    "client/FdrClient": "src/client/FdrClient.ts",
+    "client/types": "src/client/types.ts",
+    "utils/traversers/index": "src/utils/traversers/index.ts",
+  },
+  format: ["esm", "cjs"],
+  dts: false,
+  splitting: false,
+  sourcemap: true,
+  clean: false,
+  external: [],
+  noExternal: ["@fern-api/ui-core-utils"],
+  bundle: true,
+  minify: false,
+  target: "es2022",
+  outDir: "dist",
+  tsconfig: "tsconfig.build.json",
+  outExtension({ format }) {
+    return {
+      js: format === "esm" ? ".mjs" : ".js",
+    };
+  },
+});
diff --git a/packages/fern-dashboard/src/instrumentation-client.ts b/packages/fern-dashboard/src/instrumentation-client.ts
@@ -10,9 +10,6 @@ import { baseConfig } from "../sentry.base.config";
 if (isProduction()) {
   Sentry.init({
     ...baseConfig,
-    integrations: [Sentry.replayIntegration()],
-    replaysSessionSampleRate: 0.1,
-    replaysOnErrorSampleRate: 1.0,
   });
 }
 
diff --git a/packages/fern-docs/search-server/ask-fern/src/utils/get-model-from-config.ts b/packages/fern-docs/search-server/ask-fern/src/utils/get-model-from-config.ts
@@ -28,11 +28,16 @@ const CLAUDE_3_7_MODEL_CONFIG = {
   region: "us-east-1",
 };
 
-const DEFAULT_MODEL_CONFIG: ModelConfig = CLAUDE_3_5_MODEL_CONFIG;
+const CLAUDE_4_MODEL_CONFIG = {
+  modelId: "us.anthropic.claude-sonnet-4-20250514-v1:0",
+  region: "us-east-1",
+};
 
-const FALLBACK_MODEL_CONFIG: ModelConfig = CLAUDE_3_5_MODEL_CONFIG;
+const DEFAULT_MODEL_CONFIG: ModelConfig = CLAUDE_3_7_MODEL_CONFIG;
 
-const FALLBACK_MODEL_CONFIG_2: ModelConfig = CLAUDE_3_7_MODEL_CONFIG;
+const FALLBACK_MODEL_CONFIG: ModelConfig = CLAUDE_3_7_MODEL_CONFIG;
+
+const FALLBACK_MODEL_CONFIG_2: ModelConfig = CLAUDE_3_5_MODEL_CONFIG;
 
 const modelMap: Record<ModelId, ModelConfig> = {
   "claude-3.5": CLAUDE_3_5_MODEL_CONFIG,
@@ -63,6 +68,11 @@ export function getLanguageModel(model: string | undefined): {
   const modelConfig = getModelConfig(model ?? "claude-3.5");
   if (model === "claude-4") {
     const anthropic = createAnthropic({ apiKey: anthropicApiKey() });
+    const bedrock_4 = createAmazonBedrock({
+      region: FALLBACK_MODEL_CONFIG.region,
+      accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+    });
     const bedrock_3_5 = createAmazonBedrock({
       region: FALLBACK_MODEL_CONFIG.region,
       accessKeyId: process.env.AWS_ACCESS_KEY_ID,
@@ -76,9 +86,10 @@ export function getLanguageModel(model: string | undefined): {
     return {
       model: createFallback({
         models: [
+          bedrock_4(CLAUDE_4_MODEL_CONFIG.modelId),
+          bedrock_3_7(FALLBACK_MODEL_CONFIG.modelId),
+          bedrock_3_5(FALLBACK_MODEL_CONFIG_2.modelId),
           anthropic("claude-4-sonnet-20250514"),
-          bedrock_3_5(FALLBACK_MODEL_CONFIG.modelId),
-          bedrock_3_7(FALLBACK_MODEL_CONFIG_2.modelId),
         ],
       }),
       provider: "anthropic",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { FdrAPI } from "@fern-api/fdr-sdk/client/types";`
	`1`	`+import { FdrAPI } from "@fern-api/fdr-sdk";`
`2`	`2`
`3`	`3`	`export class DefinitionObjectFactory {`
`4`	`4`	`public static createDocsDefinition(): FdrAPI.docs.v1.read.DocsDefinition {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { APIV1Read } from "@fern-api/fdr-sdk/client/types";`
	`1`	`+import { APIV1Read } from "@fern-api/fdr-sdk";`
`2`	`2`
`3`	`3`	`export function stringifyEndpointPathParts(`
`4`	`4`	`path: APIV1Read.EndpointPathPart[]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { DocsV1Read } from "@fern-api/fdr-sdk/client/types";`
	`1`	`+import type { DocsV1Read } from "@fern-api/fdr-sdk";`
`2`	`2`	`import type * as FernNavigation from "@fern-api/fdr-sdk/navigation";`
`3`	`3`
`4`	`4`	`export interface ColorsConfig {`