fix: depcheck issue (#2079)

fern-api · Jan 24, 2025 · 81ee2b8 · 81ee2b8
1 parent 1a8125c
commit 81ee2b8
Show file tree

Hide file tree

Showing 29 changed files with 92 additions and 92 deletions.
diff --git a/clis/generator-cli/package.json b/clis/generator-cli/package.json
@@ -33,7 +33,7 @@
     "@types/node": "^18.7.18",
     "@types/yargs": "^17.0.32",
     "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.15",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "esbuild": "0.20.2",
     "eslint": "^9",
     "execa": "^9.5.1",

diff --git a/clis/vercel-scripts/package.json b/clis/vercel-scripts/package.json
@@ -22,7 +22,7 @@
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
     "@types/yargs": "^17.0.32",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "tsx": "^4.7.1",

diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "@typescript-eslint/parser": "8.18.1",
     "@yarnpkg/sdks": "^3.1.0",
     "chalk": "^5.3.0",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "dotenv": "^16.4.5",
     "eslint": "^9",
     "eslint-config-next": "15.1.2",

diff --git a/packages/commons/core-utils/package.json b/packages/commons/core-utils/package.json
@@ -67,7 +67,7 @@
     "@types/node": "^18.7.18",
     "@types/title": "^3.4.3",
     "@types/ua-parser-js": "^0.7.39",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/commons/fdr-utils/package.json b/packages/commons/fdr-utils/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/commons/github/package.json b/packages/commons/github/package.json
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "simple-git": "^3.24.0",

diff --git a/packages/commons/loadable/package.json b/packages/commons/loadable/package.json
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/commons/react-commons/package.json b/packages/commons/react-commons/package.json
@@ -40,7 +40,7 @@
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
     "@types/react": "^18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/auth/package.json b/packages/fern-docs/auth/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/bundle/package.json b/packages/fern-docs/bundle/package.json
@@ -91,7 +91,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "autoprefixer": "^10.4.16",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "glslify-import": "^3.1.0",
     "glslify-loader": "^2.0.0",

diff --git a/packages/fern-docs/cache/package.json b/packages/fern-docs/cache/package.json
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/components/package.json b/packages/fern-docs/components/package.json
@@ -110,7 +110,7 @@
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.16",
     "chromatic": "^11.3.0",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "eslint-plugin-storybook": "^0.8.0",
     "jsdom": "^24.0.0",

diff --git a/packages/fern-docs/edge-config/package.json b/packages/fern-docs/edge-config/package.json
@@ -43,7 +43,7 @@
     "@fern-docs/search-utils": "workspace:*",
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/icons-cdn/package.json b/packages/fern-docs/icons-cdn/package.json
@@ -42,7 +42,7 @@
     "@next/bundle-analyzer": "14.2.9",
     "@types/node": "^18.7.18",
     "@types/react": "^18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "next": "npm:@fern-api/[email protected]",
     "prettier": "^3.4.2",

diff --git a/packages/fern-docs/local-preview-bundle/package.json b/packages/fern-docs/local-preview-bundle/package.json
@@ -63,7 +63,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "autoprefixer": "^10.4.16",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "express": "^4.21.2",
     "glslify-import": "^3.1.0",

diff --git a/packages/fern-docs/mdx/package.json b/packages/fern-docs/mdx/package.json
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/search-server/package.json b/packages/fern-docs/search-server/package.json
@@ -76,7 +76,7 @@
     "@types/html-to-text": "^9.0.1",
     "@types/marked": "^5.0.0",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/search-utils/package.json b/packages/fern-docs/search-utils/package.json
@@ -36,7 +36,7 @@
     "@fern-platform/configs": "workspace:*",
     "@inkeep/widgets": "^0.2.288",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "instantsearch.js": "^4.75.4",
     "prettier": "^3.4.2",

diff --git a/packages/fern-docs/seo/package.json b/packages/fern-docs/seo/package.json
@@ -41,7 +41,7 @@
     "@fern-platform/fdr-utils": "workspace:*",
     "@types/node": "^18.7.18",
     "@types/react": "^18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/fern-docs/ui/.depcheckrc.json b/packages/fern-docs/ui/.depcheckrc.json
@@ -4,7 +4,6 @@
     "@types/node",
     "vite",
     "@types/react",
-    "@types/react",
     "@types/react-dom",
     "@radix-ui/colors",
     "autoprefixer",

diff --git a/packages/fern-docs/ui/package.json b/packages/fern-docs/ui/package.json
@@ -151,7 +151,7 @@
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.16",
     "chromatic": "^11.3.0",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "eslint-plugin-storybook": "^0.8.0",
     "express": "^4.21.2",

diff --git a/packages/fern-docs/ui/src/atoms/docs.ts b/packages/fern-docs/ui/src/atoms/docs.ts
@@ -1,9 +1,10 @@
 import { DocsV1Read } from "@fern-api/fdr-sdk";
 import * as FernNavigation from "@fern-api/fdr-sdk/navigation";
 import { DEFAULT_EDGE_FLAGS } from "@fern-docs/utils";
-import { atomWithReducer, useHydrateAtoms } from "jotai/utils";
+import { isEqual } from "es-toolkit/predicate";
+import { atomWithReducer, selectAtom, useHydrateAtoms } from "jotai/utils";
 import type { PropsWithChildren, ReactNode } from "react";
-import type { DocsProps } from "./types";
+import type { DocsProps, JsConfig } from "./types";
 
 export const EMPTY_ANALYTICS_CONFIG: DocsV1Read.AnalyticsConfig = {
   segment: undefined,
@@ -99,3 +100,38 @@ export function HydrateAtoms({
   });
   return children;
 }
+
+export const JS_ATOM = selectAtom(DOCS_ATOM, (docs) => docs.js, isEqual);
+
+export function withCustomJavascript(
+  readShapeJsConfig: DocsV1Read.JsConfig | undefined,
+  resolveFileSrc: (fileId: string) => { src: string } | undefined
+): JsConfig | undefined {
+  const remote = [
+    ...(readShapeJsConfig?.remote ?? []),
+    ...(readShapeJsConfig?.files ?? []).map((file) => ({
+      url: resolveFileSrc(file.fileId)?.src,
+      strategy: file.strategy,
+    })),
+  ].filter(isRemote);
+
+  const toRet = {
+    inline: readShapeJsConfig?.inline,
+    remote: remote.length > 0 ? remote : undefined,
+  };
+
+  if (!toRet.inline && !toRet.remote) {
+    return undefined;
+  }
+
+  return toRet;
+}
+
+type RemoteJs = NonNullable<JsConfig["remote"]>[number];
+
+function isRemote(remote: {
+  url: string | undefined; // potentially undefined if the file is not found
+  strategy: RemoteJs["strategy"];
+}): remote is RemoteJs {
+  return remote.url != null;
+}
diff --git a/packages/fern-docs/ui/src/atoms/index.ts b/packages/fern-docs/ui/src/atoms/index.ts
@@ -1,10 +1,15 @@
 export * from "./announcement";
 export * from "./apis";
 export * from "./auth";
-export * from "./docs";
+export {
+  DOCS_ATOM,
+  EMPTY_ANALYTICS_CONFIG,
+  EMPTY_DOCS_STATE,
+  HydrateAtoms,
+  JS_ATOM,
+} from "./docs";
 export * from "./flags";
 export * from "./hooks";
-export { JS_ATOM } from "./js";
 export * from "./lang";
 export * from "./layout";
 export * from "./location";

diff --git a/packages/fern-docs/ui/src/atoms/js.ts b/packages/fern-docs/ui/src/atoms/js.ts
diff --git a/packages/fern-docs/ui/src/index.ts b/packages/fern-docs/ui/src/index.ts
@@ -7,7 +7,7 @@ export type {
   LogoConfiguration,
   NavbarLink,
 } from "./atoms";
-export { withCustomJavascript } from "./atoms/js";
+export { withCustomJavascript } from "./atoms/docs";
 export { withLogo } from "./atoms/logo";
 export * from "./docs/DocsPage";
 export * from "./docs/NextApp";

diff --git a/packages/fern-docs/utils/package.json b/packages/fern-docs/utils/package.json
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@fern-platform/configs": "workspace:*",
     "@types/node": "^18.7.18",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "stylelint": "^16.1.0",

diff --git a/packages/healthchecks/package.json b/packages/healthchecks/package.json
@@ -43,7 +43,7 @@
     "@types/node": "^18.7.18",
     "@types/yargs": "^17.0.32",
     "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.15",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "esbuild": "0.20.2",
     "eslint": "^9",
     "prettier": "^3.4.2",

diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -40,7 +40,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.7.18",
     "@types/yargs": "^17.0.32",
-    "depcheck": "^1.4.3",
+    "depcheck": "^1.4.7",
     "eslint": "^9",
     "prettier": "^3.4.2",
     "typescript": "^5",