From 465b270072bfeee8f771d5f26b0b912f12ed02a4 Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Fri, 20 Dec 2024 18:54:51 -0500 Subject: [PATCH] remove organize-imports-cli in favor of prettier plugin --- clis/generator-cli/package.json | 2 - clis/vercel-scripts/package.json | 2 - package.json | 1 - packages/commons/core-utils/package.json | 2 - packages/commons/core-utils/src/index.ts | 8 +- packages/commons/fdr-utils/package.json | 2 - packages/commons/github/package.json | 2 - packages/commons/loadable/package.json | 2 - packages/commons/react-commons/package.json | 2 - packages/fdr-sdk/src/api-definition/index.ts | 2 +- .../src/navigation/versions/latest/index.ts | 14 +- .../src/navigation/versions/v1/index.ts | 12 +- packages/fern-docs/auth/package.json | 2 - packages/fern-docs/bundle/package.json | 2 - .../fern-docs/bundle/src/server/DocsLoader.ts | 2 +- .../src/server/LoadDocsPerformanceTracker.ts | 2 +- .../src/server/getDynamicDocsPageProps.ts | 2 +- .../bundle/src/server/loadWithUrl.ts | 2 +- .../src/server/withResolvedDocsContent.ts | 2 +- packages/fern-docs/cache/package.json | 2 - packages/fern-docs/cache/src/index.ts | 2 +- packages/fern-docs/components/package.json | 2 - packages/fern-docs/components/src/index.ts | 6 +- packages/fern-docs/edge-config/package.json | 2 - packages/fern-docs/icons-cdn/package.json | 2 - .../local-preview-bundle/package.json | 2 - .../src/utils/getDocsPageProps.ts | 12 +- packages/fern-docs/mdx/package.json | 2 - packages/fern-docs/next-seo/package.json | 2 - packages/fern-docs/search-server/package.json | 2 - .../search-ui/src/components/ui/label.tsx | 2 +- packages/fern-docs/search-utils/package.json | 2 - packages/fern-docs/search-utils/src/index.ts | 2 +- .../src/FernSyntaxHighlighterTokens.tsx | 2 +- ...FernSyntaxHighlighterTokensVirtualized.tsx | 2 +- packages/fern-docs/ui/.storybook/preview.tsx | 1 - packages/fern-docs/ui/package.json | 2 - packages/fern-docs/ui/src/docs/NextApp.tsx | 2 +- .../ui/src/layouts/TableOfContentsLayout.tsx | 2 +- packages/fern-docs/utils/package.json | 2 - packages/healthchecks/package.json | 2 - packages/parsers/package.json | 1 - .../parsers/src/openapi/3.1/paths/index.ts | 4 +- .../parsers/src/openapi/3.1/schemas/index.ts | 2 +- packages/scripts/package.json | 2 - packages/template-resolver/package.json | 1 - .../nextjs-proxy/eslint.config.mjs | 4 +- pnpm-lock.yaml | 165 +----------------- .../docs/v1/getDocsWriteService.ts | 2 +- servers/fdr/src/db/generators/GeneratorDao.ts | 1 - servers/fdr/src/db/sdk/SdkDao.ts | 1 - servers/fdr/src/util/index.ts | 2 +- .../update-fdr-repo-data/updateFDRRepoData.ts | 2 +- 53 files changed, 50 insertions(+), 259 deletions(-) diff --git a/clis/generator-cli/package.json b/clis/generator-cli/package.json index 61868e4dd4..00230f18fc 100644 --- a/clis/generator-cli/package.json +++ b/clis/generator-cli/package.json @@ -20,7 +20,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals --disable-console-intercept", "test:update": "vitest -u --run --passWithNoTests --globals --disable-console-intercept" }, @@ -38,7 +37,6 @@ "esbuild": "0.20.2", "eslint": "^9", "execa": "^9.5.1", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "tmp-promise": "^3.0.3", "tsup": "^8.3.5", diff --git a/clis/vercel-scripts/package.json b/clis/vercel-scripts/package.json index 8c7f2d04f6..278843c9e6 100644 --- a/clis/vercel-scripts/package.json +++ b/clis/vercel-scripts/package.json @@ -10,7 +10,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "vercel-scripts": "pnpm tsx src/cli.ts" }, "dependencies": { @@ -25,7 +24,6 @@ "@types/yargs": "^17.0.32", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "tsx": "^4.7.1", "typescript": "4.9.5", diff --git a/package.json b/package.json index b61188ed46..aa344b63b0 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,6 @@ "js-yaml": "^4.1.0", "jsonc-parser": "~2.2.1", "lint-staged": "^13.0.3", - "organize-imports-cli": "^0.10.0", "playwright": "^1.47.1", "prettier": "^3.4.2", "prettier-plugin-organize-imports": "^4.1.0", diff --git a/packages/commons/core-utils/package.json b/packages/commons/core-utils/package.json index 21e461044c..8733238d43 100644 --- a/packages/commons/core-utils/package.json +++ b/packages/commons/core-utils/package.json @@ -53,7 +53,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -70,7 +69,6 @@ "@types/ua-parser-js": "^0.7.39", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/commons/core-utils/src/index.ts b/packages/commons/core-utils/src/index.ts index 3c6dddc898..37601fb39d 100644 --- a/packages/commons/core-utils/src/index.ts +++ b/packages/commons/core-utils/src/index.ts @@ -1,7 +1,3 @@ -export { - visitObject, - type ObjectPropertiesVisitor, -} from "./ObjectPropertiesVisitor"; export { addPrefixToString } from "./addPrefixToString"; export { assertNever, assertNeverNoThrow } from "./assertNever"; export { assertVoidNoThrow } from "./assertVoidNoThrow"; @@ -13,6 +9,10 @@ export { EMPTY_ARRAY, EMPTY_OBJECT } from "./empty"; export { formatUtc } from "./formatUtc"; export { identity } from "./identity"; export { assertNonNullish, isNonNullish } from "./isNonNullish"; +export { + visitObject, + type ObjectPropertiesVisitor, +} from "./ObjectPropertiesVisitor"; export { entries, type Entries } from "./objects/entries"; export { isPlainObject } from "./objects/isPlainObject"; export { keys } from "./objects/keys"; diff --git a/packages/commons/fdr-utils/package.json b/packages/commons/fdr-utils/package.json index f9ab799208..c5169eca3f 100644 --- a/packages/commons/fdr-utils/package.json +++ b/packages/commons/fdr-utils/package.json @@ -28,7 +28,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -40,7 +39,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/commons/github/package.json b/packages/commons/github/package.json index 3bcfc938d1..db110f17d8 100644 --- a/packages/commons/github/package.json +++ b/packages/commons/github/package.json @@ -32,7 +32,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -44,7 +43,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "simple-git": "^3.24.0", "stylelint": "^16.1.0", diff --git a/packages/commons/loadable/package.json b/packages/commons/loadable/package.json index 78b4e42a67..afedfd1a84 100644 --- a/packages/commons/loadable/package.json +++ b/packages/commons/loadable/package.json @@ -26,7 +26,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -37,7 +36,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/commons/react-commons/package.json b/packages/commons/react-commons/package.json index 3065545ee8..16f4781082 100644 --- a/packages/commons/react-commons/package.json +++ b/packages/commons/react-commons/package.json @@ -26,7 +26,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -43,7 +42,6 @@ "@types/react": "^18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fdr-sdk/src/api-definition/index.ts b/packages/fdr-sdk/src/api-definition/index.ts index 8a46819254..d4e99a7177 100644 --- a/packages/fdr-sdk/src/api-definition/index.ts +++ b/packages/fdr-sdk/src/api-definition/index.ts @@ -6,8 +6,8 @@ export * from "./lang"; export * from "./latest"; export * from "./migrators/v1ToV2"; export * from "./prune"; -export * from "./snippets/SnippetHttpRequest"; export * from "./snippets/curl"; +export * from "./snippets/SnippetHttpRequest"; export * from "./status-message"; export * from "./transformer"; export * from "./types"; diff --git a/packages/fdr-sdk/src/navigation/versions/latest/index.ts b/packages/fdr-sdk/src/navigation/versions/latest/index.ts index 609075cabe..8706b554c7 100644 --- a/packages/fdr-sdk/src/navigation/versions/latest/index.ts +++ b/packages/fdr-sdk/src/navigation/versions/latest/index.ts @@ -1,5 +1,12 @@ export * from "../../../client/generated/api/resources/commons"; export * from "../../../client/generated/api/resources/navigation/resources/latest/types"; +export * from "./getChildren"; +export * from "./getPageId"; +export * from "./isApiReferenceNode"; +export * from "./isSidebarRootNode"; +export * from "./isTabbedNode"; +export * from "./isUnversionedNode"; +export * from "./isVersionNode"; export * from "./NavigationNode"; export * from "./NavigationNodeApiLeaf"; export * from "./NavigationNodeLeaf"; @@ -12,13 +19,6 @@ export * from "./NavigationNodeSection"; export * from "./NavigationNodeSectionOverview"; export * from "./NavigationNodeWithMetadata"; export * from "./NavigationNodeWithRedirect"; -export * from "./getChildren"; -export * from "./getPageId"; -export * from "./isApiReferenceNode"; -export * from "./isSidebarRootNode"; -export * from "./isTabbedNode"; -export * from "./isUnversionedNode"; -export * from "./isVersionNode"; export * from "./slugjoin"; export * from "./toDefaultSlug"; export * from "./traverseBF"; diff --git a/packages/fdr-sdk/src/navigation/versions/v1/index.ts b/packages/fdr-sdk/src/navigation/versions/v1/index.ts index 23737f9b41..1fa0f0c0a4 100644 --- a/packages/fdr-sdk/src/navigation/versions/v1/index.ts +++ b/packages/fdr-sdk/src/navigation/versions/v1/index.ts @@ -1,5 +1,11 @@ export * from "../../../client/generated/api/resources/commons"; export * from "../../../client/generated/api/resources/navigation/resources/v1/types"; +export * from "./convertAvailability"; +export * from "./converters/ApiReferenceNavigationConverter"; +export * from "./converters/SlugGenerator"; +export * from "./converters/toRootNode"; +export * from "./followRedirect"; +export * from "./getPageId"; export * from "./NavigationNode"; export * from "./NavigationNodeApiLeaf"; export * from "./NavigationNodeLeaf"; @@ -11,12 +17,6 @@ export * from "./NavigationNodeSection"; export * from "./NavigationNodeSectionOverview"; export * from "./NavigationNodeWithMetadata"; export * from "./NavigationNodeWithRedirect"; -export * from "./convertAvailability"; -export * from "./converters/ApiReferenceNavigationConverter"; -export * from "./converters/SlugGenerator"; -export * from "./converters/toRootNode"; -export * from "./followRedirect"; -export * from "./getPageId"; export * from "./slugjoin"; export * from "./toDefaultSlug"; export * from "./traverseDF"; diff --git a/packages/fern-docs/auth/package.json b/packages/fern-docs/auth/package.json index ce95799266..8bff5355b1 100644 --- a/packages/fern-docs/auth/package.json +++ b/packages/fern-docs/auth/package.json @@ -30,7 +30,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -41,7 +40,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/bundle/package.json b/packages/fern-docs/bundle/package.json index 23ae391424..a6d19ba127 100644 --- a/packages/fern-docs/bundle/package.json +++ b/packages/fern-docs/bundle/package.json @@ -20,7 +20,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -82,7 +81,6 @@ "eslint": "^9", "glslify-import": "^3.1.0", "glslify-loader": "^2.0.0", - "organize-imports-cli": "^0.10.0", "postcss": "^8.4.33", "prettier": "^3.4.2", "raw-loader": "^4.0.2", diff --git a/packages/fern-docs/bundle/src/server/DocsLoader.ts b/packages/fern-docs/bundle/src/server/DocsLoader.ts index 543d712717..404696596b 100644 --- a/packages/fern-docs/bundle/src/server/DocsLoader.ts +++ b/packages/fern-docs/bundle/src/server/DocsLoader.ts @@ -5,8 +5,8 @@ import { } from "@fern-api/fdr-sdk/api-definition"; import * as FernNavigation from "@fern-api/fdr-sdk/navigation"; import type { AuthEdgeConfig } from "@fern-docs/auth"; -import { getAuthEdgeConfig } from "@fern-docs/edge-config"; import { ApiDefinitionLoader } from "@fern-docs/cache"; +import { getAuthEdgeConfig } from "@fern-docs/edge-config"; import { getAuthState, type AuthState } from "./auth/getAuthState"; import { loadWithUrl } from "./loadWithUrl"; import { pruneWithAuthState } from "./withRbac"; diff --git a/packages/fern-docs/bundle/src/server/LoadDocsPerformanceTracker.ts b/packages/fern-docs/bundle/src/server/LoadDocsPerformanceTracker.ts index 0a10f35dfa..0a6194bc3c 100644 --- a/packages/fern-docs/bundle/src/server/LoadDocsPerformanceTracker.ts +++ b/packages/fern-docs/bundle/src/server/LoadDocsPerformanceTracker.ts @@ -1,6 +1,6 @@ import { FernNavigation } from "@fern-api/fdr-sdk"; -import { TRACK_LOAD_DOCS_PERFORMANCE } from "@fern-docs/utils"; import { DocsPage } from "@fern-docs/ui"; +import { TRACK_LOAD_DOCS_PERFORMANCE } from "@fern-docs/utils"; import { GetServerSidePropsResult } from "next/types"; import { ComponentProps } from "react"; import { track } from "./analytics/posthog"; diff --git a/packages/fern-docs/bundle/src/server/getDynamicDocsPageProps.ts b/packages/fern-docs/bundle/src/server/getDynamicDocsPageProps.ts index f6a3b7918b..2750f230d0 100644 --- a/packages/fern-docs/bundle/src/server/getDynamicDocsPageProps.ts +++ b/packages/fern-docs/bundle/src/server/getDynamicDocsPageProps.ts @@ -1,6 +1,6 @@ import { FernNavigation } from "@fern-api/fdr-sdk"; -import { COOKIE_FERN_TOKEN } from "@fern-docs/utils"; import { type DocsPage } from "@fern-docs/ui"; +import { COOKIE_FERN_TOKEN } from "@fern-docs/utils"; import type { NextApiRequestCookies } from "next/dist/server/api-utils"; import type { GetServerSidePropsResult } from "next/types"; import type { ComponentProps } from "react"; diff --git a/packages/fern-docs/bundle/src/server/loadWithUrl.ts b/packages/fern-docs/bundle/src/server/loadWithUrl.ts index d7790ae873..953e22bc26 100644 --- a/packages/fern-docs/bundle/src/server/loadWithUrl.ts +++ b/packages/fern-docs/bundle/src/server/loadWithUrl.ts @@ -1,6 +1,6 @@ import { APIResponse, FdrAPI } from "@fern-api/fdr-sdk/client/types"; -import { withoutStaging } from "@fern-docs/utils"; import { provideRegistryService } from "@fern-docs/ui"; +import { withoutStaging } from "@fern-docs/utils"; export type LoadWithUrlResponse = APIResponse< FdrAPI.docs.v2.read.LoadDocsForUrlResponse, diff --git a/packages/fern-docs/bundle/src/server/withResolvedDocsContent.ts b/packages/fern-docs/bundle/src/server/withResolvedDocsContent.ts index ac1edb18a0..30b4221cad 100644 --- a/packages/fern-docs/bundle/src/server/withResolvedDocsContent.ts +++ b/packages/fern-docs/bundle/src/server/withResolvedDocsContent.ts @@ -1,8 +1,8 @@ import { DocsV1Read } from "@fern-api/fdr-sdk"; import type * as FernNavigation from "@fern-api/fdr-sdk/navigation"; -import { FeatureFlags } from "@fern-docs/utils"; import { resolveDocsContent, type DocsContent } from "@fern-docs/ui"; import { getMdxBundler } from "@fern-docs/ui/bundlers"; +import { FeatureFlags } from "@fern-docs/utils"; import { AuthState } from "./auth/getAuthState"; import { withPrunedNavigation } from "./withPrunedNavigation"; diff --git a/packages/fern-docs/cache/package.json b/packages/fern-docs/cache/package.json index d961113f13..651fac2b9e 100644 --- a/packages/fern-docs/cache/package.json +++ b/packages/fern-docs/cache/package.json @@ -30,7 +30,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -46,7 +45,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/cache/src/index.ts b/packages/fern-docs/cache/src/index.ts index ecf148bd26..7e14d4f0b6 100644 --- a/packages/fern-docs/cache/src/index.ts +++ b/packages/fern-docs/cache/src/index.ts @@ -1,3 +1,3 @@ export * from "./ApiDefinitionLoader"; -export * from "./MarkdownLoader"; export * from "./DocsLoader"; +export * from "./MarkdownLoader"; diff --git a/packages/fern-docs/components/package.json b/packages/fern-docs/components/package.json index 25e084dd13..898a70e4c7 100644 --- a/packages/fern-docs/components/package.json +++ b/packages/fern-docs/components/package.json @@ -39,7 +39,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "storybook": "storybook dev -p 6006", "test": "vitest --run --passWithNoTests --globals --disable-console-intercept" }, @@ -107,7 +106,6 @@ "eslint": "^9", "eslint-plugin-storybook": "^0.8.0", "jsdom": "^24.0.0", - "organize-imports-cli": "^0.10.0", "postcss-import": "^16.0.1", "prettier": "^3.4.2", "react-test-renderer": "^18", diff --git a/packages/fern-docs/components/src/index.ts b/packages/fern-docs/components/src/index.ts index 3c80c5a8d2..9a458a9f2a 100644 --- a/packages/fern-docs/components/src/index.ts +++ b/packages/fern-docs/components/src/index.ts @@ -1,4 +1,7 @@ +export * from "./badges"; export * from "./BuiltWithFern"; +export * from "./cn"; +export * from "./colors"; export * from "./CopyToClipboardButton"; export * from "./Empty"; export * from "./FernAudioPlayer"; @@ -24,8 +27,5 @@ export * from "./FernTextarea"; export * from "./FernToast"; export * from "./FernTooltip"; export * from "./FontAwesomeIcon"; -export * from "./badges"; -export * from "./cn"; -export * from "./colors"; export * from "./kbd"; export * from "./util/shared-component-types"; diff --git a/packages/fern-docs/edge-config/package.json b/packages/fern-docs/edge-config/package.json index 23f0a375f8..9c8ee2191d 100644 --- a/packages/fern-docs/edge-config/package.json +++ b/packages/fern-docs/edge-config/package.json @@ -30,7 +30,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -46,7 +45,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/icons-cdn/package.json b/packages/fern-docs/icons-cdn/package.json index 609eed785a..79f1c3eb30 100644 --- a/packages/fern-docs/icons-cdn/package.json +++ b/packages/fern-docs/icons-cdn/package.json @@ -19,7 +19,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "start": "next start", "test": "vitest --run --passWithNoTests --globals" }, @@ -46,7 +45,6 @@ "depcheck": "^1.4.3", "eslint": "^9", "next": "npm:@fern-api/next@14.2.9-fork.2", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/local-preview-bundle/package.json b/packages/fern-docs/local-preview-bundle/package.json index 41bd8474b2..f4650214ac 100644 --- a/packages/fern-docs/local-preview-bundle/package.json +++ b/packages/fern-docs/local-preview-bundle/package.json @@ -28,7 +28,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "start": "node server.js", "test": "vitest --run --passWithNoTests --globals" }, @@ -66,7 +65,6 @@ "express": "^4.20.0", "glslify-import": "^3.1.0", "glslify-loader": "^2.0.0", - "organize-imports-cli": "^0.10.0", "postcss": "^8.4.33", "prettier": "^3.4.2", "raw-loader": "^4.0.2", diff --git a/packages/fern-docs/local-preview-bundle/src/utils/getDocsPageProps.ts b/packages/fern-docs/local-preview-bundle/src/utils/getDocsPageProps.ts index 924ec9fee8..ea254a7f86 100644 --- a/packages/fern-docs/local-preview-bundle/src/utils/getDocsPageProps.ts +++ b/packages/fern-docs/local-preview-bundle/src/utils/getDocsPageProps.ts @@ -1,12 +1,6 @@ import { FdrAPI, type DocsV2Read } from "@fern-api/fdr-sdk/client/types"; import * as FernNavigation from "@fern-api/fdr-sdk/navigation"; import { visitDiscriminatedUnion } from "@fern-api/ui-core-utils"; -import { SidebarTab } from "@fern-platform/fdr-utils"; -import { - DEFAULT_FEATURE_FLAGS, - getRedirectForPath, - type FeatureFlags, -} from "@fern-docs/utils"; import { DocsPage, NavbarLink, @@ -17,6 +11,12 @@ import { resolveDocsContent, } from "@fern-docs/ui"; import { serializeMdx } from "@fern-docs/ui/bundlers/next-mdx-remote"; +import { + DEFAULT_FEATURE_FLAGS, + getRedirectForPath, + type FeatureFlags, +} from "@fern-docs/utils"; +import { SidebarTab } from "@fern-platform/fdr-utils"; import type { GetServerSidePropsResult } from "next"; import { ComponentProps } from "react"; import urljoin from "url-join"; diff --git a/packages/fern-docs/mdx/package.json b/packages/fern-docs/mdx/package.json index c93d5b93a5..48b6fbfd77 100644 --- a/packages/fern-docs/mdx/package.json +++ b/packages/fern-docs/mdx/package.json @@ -34,7 +34,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -76,7 +75,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/next-seo/package.json b/packages/fern-docs/next-seo/package.json index fb74ae4e3e..62e1362bee 100644 --- a/packages/fern-docs/next-seo/package.json +++ b/packages/fern-docs/next-seo/package.json @@ -26,7 +26,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -40,7 +39,6 @@ "@types/react": "^18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/search-server/package.json b/packages/fern-docs/search-server/package.json index 8c2f9d97db..a497ccea98 100644 --- a/packages/fern-docs/search-server/package.json +++ b/packages/fern-docs/search-server/package.json @@ -53,7 +53,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -79,7 +78,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/fern-docs/search-ui/src/components/ui/label.tsx b/packages/fern-docs/search-ui/src/components/ui/label.tsx index 9996a23784..f3702020de 100644 --- a/packages/fern-docs/search-ui/src/components/ui/label.tsx +++ b/packages/fern-docs/search-ui/src/components/ui/label.tsx @@ -1,6 +1,6 @@ import * as LabelPrimitive from "@radix-ui/react-label"; -import React from "react"; import { cva, type VariantProps } from "class-variance-authority"; +import React from "react"; import { cn } from "./cn"; diff --git a/packages/fern-docs/search-utils/package.json b/packages/fern-docs/search-utils/package.json index 8282d2a9c6..85a51b24b7 100644 --- a/packages/fern-docs/search-utils/package.json +++ b/packages/fern-docs/search-utils/package.json @@ -26,7 +26,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -40,7 +39,6 @@ "depcheck": "^1.4.3", "eslint": "^9", "instantsearch.js": "^4.75.4", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "ts-essentials": "^10.0.1", diff --git a/packages/fern-docs/search-utils/src/index.ts b/packages/fern-docs/search-utils/src/index.ts index 6c2f838ebe..277fc3472d 100644 --- a/packages/fern-docs/search-utils/src/index.ts +++ b/packages/fern-docs/search-utils/src/index.ts @@ -1,3 +1,3 @@ -export * from "./SearchConfig"; export * from "./getSlugForSearchRecord"; +export * from "./SearchConfig"; export * from "./types"; diff --git a/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokens.tsx b/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokens.tsx index 01ec9bea2b..0a106150f3 100644 --- a/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokens.tsx +++ b/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokens.tsx @@ -1,5 +1,5 @@ -import { parseStringStyle, visit } from "@fern-docs/mdx"; import { FernScrollArea } from "@fern-docs/components"; +import { parseStringStyle, visit } from "@fern-docs/mdx"; import cn from "clsx"; import { isEqual } from "es-toolkit/predicate"; import type { Element } from "hast"; diff --git a/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokensVirtualized.tsx b/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokensVirtualized.tsx index 2ae25c8116..eedd410600 100644 --- a/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokensVirtualized.tsx +++ b/packages/fern-docs/syntax-highlighter/src/FernSyntaxHighlighterTokensVirtualized.tsx @@ -1,5 +1,5 @@ -import { parseStringStyle, visit } from "@fern-docs/mdx"; import { FernScrollArea } from "@fern-docs/components"; +import { parseStringStyle, visit } from "@fern-docs/mdx"; import cn from "clsx"; import type { Element } from "hast"; import { diff --git a/packages/fern-docs/ui/.storybook/preview.tsx b/packages/fern-docs/ui/.storybook/preview.tsx index 7f6ca4f6d4..97c4ad98d6 100644 --- a/packages/fern-docs/ui/.storybook/preview.tsx +++ b/packages/fern-docs/ui/.storybook/preview.tsx @@ -1,7 +1,6 @@ import { FernTooltipProvider, Toaster } from "@fern-docs/components"; import { withThemeByClassName } from "@storybook/addon-themes"; import type { Preview } from "@storybook/react"; -import React from "react"; import "../src/css/globals.scss"; import "./variables.css"; diff --git a/packages/fern-docs/ui/package.json b/packages/fern-docs/ui/package.json index 990103d372..57b0741e71 100644 --- a/packages/fern-docs/ui/package.json +++ b/packages/fern-docs/ui/package.json @@ -33,7 +33,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "storybook": "storybook dev -p 6006", "test": "vitest --run --passWithNoTests --globals --disable-console-intercept" }, @@ -160,7 +159,6 @@ "instantsearch.js": "^4.75.4", "jsdom": "^24.0.0", "next-router-mock": "^0.9.13", - "organize-imports-cli": "^0.10.0", "postcss-import": "^16.0.1", "prettier": "^3.4.2", "sass": "^1.74.1", diff --git a/packages/fern-docs/ui/src/docs/NextApp.tsx b/packages/fern-docs/ui/src/docs/NextApp.tsx index ec80980b15..a41dbfec68 100644 --- a/packages/fern-docs/ui/src/docs/NextApp.tsx +++ b/packages/fern-docs/ui/src/docs/NextApp.tsx @@ -5,6 +5,7 @@ import { Provider as JotaiProvider } from "jotai"; import type { AppProps } from "next/app"; import { ReactElement } from "react"; import { SWRConfig } from "swr"; +import { CustomerAnalytics } from "../analytics/CustomerAnalytics"; import { DocsProps, HydrateAtoms, store } from "../atoms"; import { FernErrorBoundary } from "../components/FernErrorBoundary"; import { LocalPreviewContextProvider } from "../contexts/local-preview"; @@ -12,7 +13,6 @@ import "../css/globals.scss"; import { NextNProgress } from "../header/NProgress"; import { useInterceptNextDataHref } from "../hooks/useInterceptNextDataHref"; import { ThemeScript } from "../themes/ThemeScript"; -import { CustomerAnalytics } from "../analytics/CustomerAnalytics"; export function NextApp({ Component, diff --git a/packages/fern-docs/ui/src/layouts/TableOfContentsLayout.tsx b/packages/fern-docs/ui/src/layouts/TableOfContentsLayout.tsx index 4a206da819..9ca4da6bab 100644 --- a/packages/fern-docs/ui/src/layouts/TableOfContentsLayout.tsx +++ b/packages/fern-docs/ui/src/layouts/TableOfContentsLayout.tsx @@ -1,5 +1,5 @@ -import type { TableOfContentsItem } from "@fern-docs/mdx"; import { FernScrollArea } from "@fern-docs/components"; +import type { TableOfContentsItem } from "@fern-docs/mdx"; import { ReactElement } from "react"; import { TableOfContents } from "../components/table-of-contents/TableOfContents"; diff --git a/packages/fern-docs/utils/package.json b/packages/fern-docs/utils/package.json index 9bcca7dd16..64bea2e999 100644 --- a/packages/fern-docs/utils/package.json +++ b/packages/fern-docs/utils/package.json @@ -30,7 +30,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals" }, "dependencies": { @@ -44,7 +43,6 @@ "@types/node": "^18.7.18", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "stylelint": "^16.1.0", "typescript": "^5", diff --git a/packages/healthchecks/package.json b/packages/healthchecks/package.json index 6d16fda6b8..40a9157510 100644 --- a/packages/healthchecks/package.json +++ b/packages/healthchecks/package.json @@ -28,7 +28,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals --disable-console-intercept" }, "dependencies": { @@ -47,7 +46,6 @@ "depcheck": "^1.4.3", "esbuild": "0.20.2", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "tsup": "^8.3.5", "typescript": "4.9.5", diff --git a/packages/parsers/package.json b/packages/parsers/package.json index 45cd791ac7..7c1bc7c168 100644 --- a/packages/parsers/package.json +++ b/packages/parsers/package.json @@ -23,7 +23,6 @@ "lint:eslint:fix": "pnpm lint:eslint --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", "lint:style:fix": "pnpm lint:style --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest --run --passWithNoTests --globals", "test:update": "vitest -u --run --passWithNoTests --globals" }, diff --git a/packages/parsers/src/openapi/3.1/paths/index.ts b/packages/parsers/src/openapi/3.1/paths/index.ts index 0d130e9bab..3564c85b00 100644 --- a/packages/parsers/src/openapi/3.1/paths/index.ts +++ b/packages/parsers/src/openapi/3.1/paths/index.ts @@ -1,7 +1,7 @@ export * from "./OperationObjectConverter.node"; +export * from "./parameters"; export * from "./PathItemObjectConverter.node"; export * from "./PathsObjectConverter.node"; -export * from "./ServerObjectConverter.node"; -export * from "./parameters"; export * from "./request"; export * from "./response"; +export * from "./ServerObjectConverter.node"; diff --git a/packages/parsers/src/openapi/3.1/schemas/index.ts b/packages/parsers/src/openapi/3.1/schemas/index.ts index 01919341c4..f40c7dbc70 100644 --- a/packages/parsers/src/openapi/3.1/schemas/index.ts +++ b/packages/parsers/src/openapi/3.1/schemas/index.ts @@ -2,6 +2,6 @@ export * from "./ArrayConverter.node"; export * from "./ComponentsConverter.node"; export * from "./ObjectConverter.node"; export * from "./OneOfConverter.node"; +export * from "./primitives"; export * from "./ReferenceConverter.node"; export * from "./SchemaConverter.node"; -export * from "./primitives"; diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 966a154775..67ba039a59 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -26,7 +26,6 @@ "format:check": "prettier --check --ignore-unknown \"**\"", "lint:eslint": "eslint --max-warnings 0 .", "lint:eslint:fix": "pnpm lint:eslint --fix", - "organize-imports": "organize-imports-cli tsconfig.json", "test": "vitest run --passWithNoTests --globals" }, "dependencies": { @@ -43,7 +42,6 @@ "@types/yargs": "^17.0.32", "depcheck": "^1.4.3", "eslint": "^9", - "organize-imports-cli": "^0.10.0", "prettier": "^3.4.2", "typescript": "^5", "vitest": "^2.1.4" diff --git a/packages/template-resolver/package.json b/packages/template-resolver/package.json index e95cee948d..ab158a8bed 100644 --- a/packages/template-resolver/package.json +++ b/packages/template-resolver/package.json @@ -38,7 +38,6 @@ "depcheck": "^1.4.6", "eslint": "^9", "jest": "^29.7.0", - "organize-imports-cli": "^0.10.0", "typescript": "^5" } } diff --git a/playwright/forward-proxy/nextjs-proxy/eslint.config.mjs b/playwright/forward-proxy/nextjs-proxy/eslint.config.mjs index e1d99bdadf..552f27a08b 100644 --- a/playwright/forward-proxy/nextjs-proxy/eslint.config.mjs +++ b/playwright/forward-proxy/nextjs-proxy/eslint.config.mjs @@ -1,7 +1,7 @@ +import { FlatCompat } from "@eslint/eslintrc"; +import js from "@eslint/js"; import path from "node:path"; import { fileURLToPath } from "node:url"; -import js from "@eslint/js"; -import { FlatCompat } from "@eslint/eslintrc"; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7aab82624b..f0657eafde 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -165,9 +165,6 @@ importers: lint-staged: specifier: ^13.0.3 version: 13.3.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 playwright: specifier: ^1.47.1 version: 1.47.1 @@ -268,9 +265,6 @@ importers: execa: specifier: ^9.5.1 version: 9.5.1 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -320,9 +314,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -409,9 +400,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -446,9 +434,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -483,9 +468,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -520,9 +502,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -572,9 +551,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -696,9 +672,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -896,9 +869,6 @@ importers: glslify-loader: specifier: ^2.0.0 version: 2.0.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 postcss: specifier: 8.4.31 version: 8.4.31 @@ -957,9 +927,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -1144,9 +1111,6 @@ importers: jsdom: specifier: ^24.0.0 version: 24.0.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 postcss-import: specifier: ^16.0.1 version: 16.1.0(postcss@8.4.31) @@ -1211,9 +1175,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -1303,9 +1264,6 @@ importers: next: specifier: npm:@fern-api/next@14.2.9-fork.2 version: '@fern-api/next@14.2.9-fork.2(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.0)' - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -1428,9 +1386,6 @@ importers: glslify-loader: specifier: ^2.0.0 version: 2.0.0 - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 postcss: specifier: 8.4.31 version: 8.4.31 @@ -1570,9 +1525,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -1613,9 +1565,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -1692,9 +1641,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -1955,9 +1901,6 @@ importers: instantsearch.js: specifier: 4.75.4 version: 4.75.4(algoliasearch@5.13.0) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -2368,9 +2311,6 @@ importers: next-router-mock: specifier: ^0.9.13 version: 0.9.13(@fern-api/next@14.2.9-fork.2(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.0))(react@18.3.1) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 postcss-import: specifier: ^16.0.1 version: 16.1.0(postcss@8.4.31) @@ -2429,9 +2369,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -2487,9 +2424,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -2585,9 +2519,6 @@ importers: eslint: specifier: 9.17.0 version: 9.17.0(jiti@1.21.7) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -2625,9 +2556,6 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.19.33)(ts-node@10.9.2(@swc/core@1.5.7)(@types/node@18.19.33)(typescript@5.7.2)) - organize-imports-cli: - specifier: ^0.10.0 - version: 0.10.0 typescript: specifier: 5.7.2 version: 5.7.2 @@ -6740,7 +6668,7 @@ packages: resolution: {integrity: sha512-GWrNeElMYHO8FVETjW205u2s9IXFs46fmVKY8T1dHgksCm3JV8w4k14gM2eaZbOUOH/tGcOuz5YbqJl8iKkA8w==} engines: {node: '>=18.0.0'} peerDependencies: - next: npm:@fern-api/next@14.2.9-fork.2 + next: ^13.5.0 || ^14.0.0 || ^15.0.0 react: 18.3.1 react-dom: 18.3.1 storybook: ^8.4.4 @@ -6952,9 +6880,6 @@ packages: resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==} engines: {node: '>=10.13.0'} - '@ts-morph/common@0.16.0': - resolution: {integrity: sha512-SgJpzkTgZKLKqQniCjLaE3c2L2sdL7UShvmTmPBejAKd2OKV/yfMpQ2IWpAuA+VY5wy7PkSUaEObIqEK6afFuw==} - '@ts-morph/common@0.20.0': resolution: {integrity: sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==} @@ -7292,12 +7217,6 @@ packages: '@types/stats.js@0.17.3': resolution: {integrity: sha512-pXNfAD3KHOdif9EQXZ9deK82HVNaXP5ZIF5RP2QG6OQFNTaY2YIetfrE9t528vEreGQvEPRDDc8muaoYeK0SxQ==} - '@types/strip-bom@3.0.0': - resolution: {integrity: sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==} - - '@types/strip-json-comments@0.0.30': - resolution: {integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==} - '@types/three@0.170.0': resolution: {integrity: sha512-CUm2uckq+zkCY7ZbFpviRttY+6f9fvwm6YqSqPfA5K22s9w7R4VnA3rzJse8kHVvuzLcTx+CjNCs2NYe0QFAyg==} @@ -8839,9 +8758,6 @@ packages: resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} - code-block-writer@11.0.3: - resolution: {integrity: sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==} - code-block-writer@12.0.0: resolution: {integrity: sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==} @@ -9671,10 +9587,6 @@ packages: ecdsa-sig-formatter@1.0.11: resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} - editorconfig@0.15.3: - resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==} - hasBin: true - ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -12105,9 +12017,6 @@ packages: resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==} engines: {node: 14 || >=16.14} - lru-cache@4.1.5: - resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} - lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} @@ -12913,10 +12822,6 @@ packages: resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==} engines: {node: '>=10'} - organize-imports-cli@0.10.0: - resolution: {integrity: sha512-cVyNEeiDxX/zA6gdK1QS2rr3TK1VymIkT0LagnAk4f6eE0IC0bo3BeUkMzm3q3GnCJzYC+6lfuMpBE0Cequ7Vg==} - hasBin: true - os-browserify@0.3.0: resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==} @@ -13714,9 +13619,6 @@ packages: prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} - pseudomap@1.0.2: - resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} - psl@1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} @@ -14537,9 +14439,6 @@ packages: siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} - sigmund@1.0.1: - resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==} - signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -15314,9 +15213,6 @@ packages: resolution: {integrity: sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==} engines: {node: '>=8'} - ts-morph@15.1.0: - resolution: {integrity: sha512-RBsGE2sDzUXFTnv8Ba22QfeuKbgvAGJFuTN7HfmIRUkgT/NaVLfDM/8OFm2NlFkGlWEXdpW5OaFIp1jvqdDuOg==} - ts-morph@19.0.0: resolution: {integrity: sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==} @@ -15370,9 +15266,6 @@ packages: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} - tsconfig@7.0.0: - resolution: {integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==} - tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -16153,9 +16046,6 @@ packages: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} - yallist@2.1.2: - resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} - yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} @@ -21790,13 +21680,6 @@ snapshots: '@trysound/sax@0.2.0': {} - '@ts-morph/common@0.16.0': - dependencies: - fast-glob: 3.3.2 - minimatch: 5.1.6 - mkdirp: 1.0.4 - path-browserify: 1.0.1 - '@ts-morph/common@0.20.0': dependencies: fast-glob: 3.3.2 @@ -22167,10 +22050,6 @@ snapshots: '@types/stats.js@0.17.3': {} - '@types/strip-bom@3.0.0': {} - - '@types/strip-json-comments@0.0.30': {} - '@types/three@0.170.0': dependencies: '@tweenjs/tween.js': 23.1.3 @@ -24546,8 +24425,6 @@ snapshots: co@4.6.0: {} - code-block-writer@11.0.3: {} - code-block-writer@12.0.0: {} cohere-ai@7.9.5: @@ -25499,13 +25376,6 @@ snapshots: dependencies: safe-buffer: 5.2.1 - editorconfig@0.15.3: - dependencies: - commander: 2.20.3 - lru-cache: 4.1.5 - semver: 5.7.2 - sigmund: 1.0.1 - ee-first@1.1.1: {} electron-to-chromium@1.5.50: {} @@ -28666,11 +28536,6 @@ snapshots: lru-cache@10.2.2: {} - lru-cache@4.1.5: - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - lru-cache@5.1.1: dependencies: yallist: 3.1.1 @@ -29958,13 +29823,6 @@ snapshots: strip-ansi: 6.0.1 wcwidth: 1.0.1 - organize-imports-cli@0.10.0: - dependencies: - chalk: 4.1.2 - editorconfig: 0.15.3 - ts-morph: 15.1.0 - tsconfig: 7.0.0 - os-browserify@0.3.0: {} os-tmpdir@1.0.2: {} @@ -30651,8 +30509,6 @@ snapshots: prr@1.0.1: optional: true - pseudomap@1.0.2: {} - psl@1.9.0: {} pstree.remy@1.1.8: {} @@ -31594,7 +31450,8 @@ snapshots: semver-compare@1.0.0: {} - semver@5.7.2: {} + semver@5.7.2: + optional: true semver@6.3.1: {} @@ -31805,8 +31662,6 @@ snapshots: siginfo@2.0.0: {} - sigmund@1.0.1: {} - signal-exit@3.0.7: {} signal-exit@4.1.0: {} @@ -32666,11 +32521,6 @@ snapshots: dependencies: tslib: 2.8.0 - ts-morph@15.1.0: - dependencies: - '@ts-morph/common': 0.16.0 - code-block-writer: 11.0.3 - ts-morph@19.0.0: dependencies: '@ts-morph/common': 0.20.0 @@ -32727,13 +32577,6 @@ snapshots: minimist: 1.2.8 strip-bom: 3.0.0 - tsconfig@7.0.0: - dependencies: - '@types/strip-bom': 3.0.0 - '@types/strip-json-comments': 0.0.30 - strip-bom: 3.0.0 - strip-json-comments: 2.0.1 - tslib@1.14.1: {} tslib@2.6.2: {} @@ -33758,8 +33601,6 @@ snapshots: y18n@5.0.8: {} - yallist@2.1.2: {} - yallist@3.1.1: {} yallist@4.0.0: {} diff --git a/servers/fdr/src/controllers/docs/v1/getDocsWriteService.ts b/servers/fdr/src/controllers/docs/v1/getDocsWriteService.ts index d51e6f978b..55dfda8a3f 100644 --- a/servers/fdr/src/controllers/docs/v1/getDocsWriteService.ts +++ b/servers/fdr/src/controllers/docs/v1/getDocsWriteService.ts @@ -5,10 +5,10 @@ import { } from "@fern-api/fdr-sdk"; import { v4 as uuidv4 } from "uuid"; import { DocsV1WriteService } from "../../../api"; +import { DocsRegistrationIdNotFound } from "../../../api/generated/api/resources/docs/resources/v1/resources/write/errors"; import type { FdrApplication } from "../../../app"; import { type S3DocsFileInfo } from "../../../services/s3"; import { writeBuffer } from "../../../util"; -import { DocsRegistrationIdNotFound } from "../../../api/generated/api/resources/docs/resources/v1/resources/write/errors"; const DOCS_REGISTRATIONS: Record< DocsV1Write.DocsRegistrationId, diff --git a/servers/fdr/src/db/generators/GeneratorDao.ts b/servers/fdr/src/db/generators/GeneratorDao.ts index e7ab0c0748..8ddf7a2510 100644 --- a/servers/fdr/src/db/generators/GeneratorDao.ts +++ b/servers/fdr/src/db/generators/GeneratorDao.ts @@ -6,7 +6,6 @@ import { GeneratorLanguage, GeneratorScripts, GeneratorType, - Script, } from "../../api/generated/api/resources/generators"; import { assertNever, readBuffer, writeBuffer } from "../../util"; diff --git a/servers/fdr/src/db/sdk/SdkDao.ts b/servers/fdr/src/db/sdk/SdkDao.ts index 6ea091e897..1769c5d63d 100644 --- a/servers/fdr/src/db/sdk/SdkDao.ts +++ b/servers/fdr/src/db/sdk/SdkDao.ts @@ -1,6 +1,5 @@ import { APIV1Write } from "@fern-api/fdr-sdk"; import { Language, Prisma, PrismaClient } from "@prisma/client"; -import { DefaultArgs } from "@prisma/client/runtime/library"; import { LOGGER } from "../../app/FdrApplication"; import { SdkIdFactory } from "../snippets/SdkIdFactory"; import { SdkId } from "../types"; diff --git a/servers/fdr/src/util/index.ts b/servers/fdr/src/util/index.ts index 2a49122918..759eeaf5c4 100644 --- a/servers/fdr/src/util/index.ts +++ b/servers/fdr/src/util/index.ts @@ -1,5 +1,5 @@ -export type { WithoutQuestionMarks } from "./WithoutQuestionMarks"; export { assertNever, assertNeverNoThrow } from "./assertNever"; export { truncateToBytes } from "./bytes"; export { convertMarkdownToText } from "./markdown"; export { readBuffer, writeBuffer } from "./serde"; +export type { WithoutQuestionMarks } from "./WithoutQuestionMarks"; diff --git a/servers/fern-bot/src/functions/update-fdr-repo-data/updateFDRRepoData.ts b/servers/fern-bot/src/functions/update-fdr-repo-data/updateFDRRepoData.ts index 7fa8172590..5e2e7ad205 100644 --- a/servers/fern-bot/src/functions/update-fdr-repo-data/updateFDRRepoData.ts +++ b/servers/fern-bot/src/functions/update-fdr-repo-data/updateFDRRepoData.ts @@ -1,7 +1,7 @@ import { evaluateEnv } from "@libs/env"; import { handlerWrapper } from "@libs/handler-wrapper"; -import { updateFDRRepoDataInternal } from "./actions/updateFDRRepoData"; import { RepoData } from "@libs/schemas"; +import { updateFDRRepoDataInternal } from "./actions/updateFDRRepoData"; const updateFDRRepoData = async (event: unknown) => { console.debug(