Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
abvthecity committed Dec 20, 2024
1 parent 54f4b2f commit cc8c896
Show file tree
Hide file tree
Showing 172 changed files with 18,096 additions and 16,089 deletions.
3 changes: 2 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"trailingComma": "es5",
"plugins": ["prettier-plugin-packagejson", "prettier-plugin-tailwindcss"]
"plugins": ["prettier-plugin-packagejson", "prettier-plugin-tailwindcss"],
"tailwindFunctions": ["clsx", "cn", "cva"]
}
2 changes: 2 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export default tseslint.config(

...compat.config({
extends: [
"prettier",
"next/core-web-vitals",
"next/typescript",
"plugin:tailwindcss/recommended",
Expand Down Expand Up @@ -111,6 +112,7 @@ export default tseslint.config(
},
],
"tailwindcss/no-custom-classname": "off",
"tailwindcss/classnames-order": "off",
},
},

Expand Down
1 change: 0 additions & 1 deletion packages/fdr-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/preset-typescript": "^7.26.0",
"@fern-api/eslint-config": "workspace:*",
"@fern-platform/configs": "workspace:*",
"@types/node-fetch": "2.6.9",
"@types/qs": "6.9.14",
Expand Down
1 change: 0 additions & 1 deletion packages/fern-docs/bundle/__mocks__/fileMock.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/fern-docs/bundle/__mocks__/styleMock.js

This file was deleted.

3 changes: 1 addition & 2 deletions packages/fern-docs/bundle/tsconfig.eslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"next.config.mjs",
"postcss.config.js",
"tailwind.config.js",
"vitest.config.ts",
"__mocks__/**/*"
"vitest.config.ts"
]
}
2 changes: 1 addition & 1 deletion packages/fern-docs/bundle/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"strictNullChecks": true
},
"exclude": ["node_modules"],
"include": ["./src/**/*", ".next/types/**/*.ts", "__mocks__"],
"include": ["./src/**/*", ".next/types/**/*.ts"],
"references": [
{
"path": "../../commons/core-utils"
Expand Down
5 changes: 3 additions & 2 deletions packages/fern-docs/components/src/FernButtonV2.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Slot } from "@radix-ui/react-slot";
import { cva, type VariantProps } from "class-variance-authority";
import React from "react";
import { cn } from "./cn";

const buttonVariants = cva(
cn(
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors hover:transition-none",
"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring",
"focus-visible:ring-ring focus-visible:outline-none focus-visible:ring-1",
"disabled:pointer-events-none disabled:opacity-50",
"[&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0"
),
Expand All @@ -17,7 +18,7 @@ const buttonVariants = cva(
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90 shadow-sm",
outline:
"border-input border bg-background shadow-sm hover:bg-[var(--grayscale-2)] hover:text-[var(--accent-12)]",
"border-input bg-background border shadow-sm hover:bg-[var(--grayscale-2)] hover:text-[var(--accent-12)]",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-sm",
ghost:
Expand Down
2 changes: 1 addition & 1 deletion packages/fern-docs/icons-cdn/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"rootDir": "."
},
"exclude": ["node_modules"],
"include": ["./src/**/*", ".next/types/**/*.ts", "__mocks__"]
"include": ["./src/**/*", ".next/types/**/*.ts"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import { ComponentPropsWithoutRef, forwardRef, memo } from "react";
import { cn } from "../ui/cn";

const buttonVariants = cva(
"inline-flex items-center justify-start gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors hover:transition-none focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-[var(--accent-6)] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 h-9 p-2 w-full cursor-text",
"inline-flex h-9 w-full cursor-text items-center justify-start gap-2 whitespace-nowrap rounded-md p-2 text-sm font-medium transition-colors hover:transition-none focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-[var(--accent-6)] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
{
variants: {
variant: {
default:
"bg-[var(--grayscale-a3)] text-[var(--grayscale-a10)] hover:bg-[var(--grayscale-a4)]",
loading:
"bg-[var(--grayscale-a3)] text-[var(--grayscale-a10)] cursor-default",
"cursor-default bg-[var(--grayscale-a3)] text-[var(--grayscale-a10)]",
},
},
defaultVariants: {
Expand Down
10 changes: 5 additions & 5 deletions packages/fern-docs/search-ui/src/components/ui/sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ const SheetOverlay = React.forwardRef<
SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;

const sheetVariants = cva(
"fixed z-50 gap-4 bg-[var(--grayscale-1)] p-6 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500 data-[state=open]:animate-in data-[state=closed]:animate-out",
"data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 gap-4 bg-[var(--grayscale-1)] p-6 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
{
variants: {
side: {
top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
top: "data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 border-b",
bottom:
"inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
"data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 border-t",
left: "data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm",
right:
"inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
"data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm",
},
},
defaultVariants: {
Expand Down
1 change: 0 additions & 1 deletion packages/fern-docs/ui/src/__mocks__/fileMock.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/fern-docs/ui/src/__mocks__/styleMock.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const EndpointUrl = React.forwardRef<
) {
const ref = useRef<HTMLDivElement>(null);

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-type-assertion
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
useImperativeHandle(parentRef, () => ref.current!);

const [isHovered, setIsHovered] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion packages/fern-docs/ui/src/mdx/components/card/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const Card: React.FC<Card.Props> = ({
badge,
}) => {
const className = cn(
"text-base border p-6 not-prose rounded-xl relative block"
"not-prose relative block rounded-xl border p-6 text-base"
);

const content = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const CodeGroup: React.FC<React.PropsWithChildren<CodeGroup.Props>> = ({
const containerClass = clsx(
"bg-card after:ring-card-border relative mb-6 mt-4 flex w-full min-w-0 max-w-full flex-col rounded-lg shadow-sm after:pointer-events-none after:absolute after:inset-0 after:rounded-[inherit] after:ring-1 after:ring-inset after:content-[''] first:mt-0",
{
"dark bg-card-solid": isDarkCodeEnabled,
"bg-card-solid dark": isDarkCodeEnabled,
}
);

Expand Down
2 changes: 1 addition & 1 deletion packages/template-resolver/src/formatSnippet.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FernRegistry } from "@fern-fern/fdr-cjs-sdk";
import parserBabel from "prettier/plugins/babel";
import * as prettierPluginEstree from "prettier/plugins/estree";
import prettierPluginEstree from "prettier/plugins/estree";
import * as prettier from "prettier/standalone";

export async function formatSnippet(
Expand Down
52 changes: 0 additions & 52 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions servers/fdr/.prettierrc.json

This file was deleted.

56 changes: 28 additions & 28 deletions servers/fdr/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,38 @@
{
"name": "@fern-platform/fdr",
"version": "0.0.0",
"main": "dist/index.js",
"repository": "[email protected]:fern-api/fern-definition-registry.git",
"author": "Deep Singhvi <[email protected]>",
"license": "MIT",
"author": "Deep Singhvi <[email protected]>",
"type": "module",
"main": "dist/index.js",
"files": [
"dist"
],
"type": "module",
"scripts": {
"clean": "rm -rf ./dist && tsc --build --clean",
"codegen": "prisma generate",
"compile": "tsc --build",
"db:down:local": "docker-compose -f docker-compose.local.yml down",
"db:migrate:dev": "dotenv -e .env.dev -- prisma migrate deploy",
"db:migrate:local": "dotenv -e .env.migrate -- prisma migrate dev",
"db:migrate:prod": "dotenv -e .env.prod -- prisma migrate deploy",
"db:up:local": "docker-compose -f docker-compose.local.yml up -d",
"dev": "tsx src/server.ts --watch",
"devjs": "node --experimental-specifier-resolution=node dist/server.js",
"docker:dev": "dotenv -e .env.dev -- ./create_docker.sh",
"docker:local": "dotenv -e .env.test -- ./create_docker.sh local",
"docker:prod": "dotenv -e .env.prod -- ./create_docker.sh",
"format": "prettier --write --ignore-unknown \"**\"",
"format:check": "prettier --check --ignore-unknown \"**\"",
"format:prisma": "prisma format",
"lint:eslint": "eslint --max-warnings 0 .",
"lint:eslint:fix": "pnpm lint:eslint --fix",
"test": "vitest --run src/** --globals",
"test:ete": "dotenv -e .env.ete -- vitest src/__test__/ete --globals --config src/__test__/ete/vitest.config.ts",
"test:local": "dotenv -e .env.test -- vitest src/__test__/local --globals --config src/__test__/local/vitest.config.ts --no-file-parallelism",
"test:update": "vitest --run src/** --globals -u"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.685.0",
"@aws-sdk/s3-request-presigner": "^3.685.0",
Expand All @@ -17,9 +41,9 @@
"@fern-api/template-resolver": "workspace:*",
"@fern-api/ui-core-utils": "workspace:*",
"@fern-api/venus-api-sdk": "^0.10.1-5-ged06d22",
"@fern-docs/search-server": "workspace:*",
"@fern-fern/fern-docs-sdk": "0.0.5",
"@fern-fern/revalidation-sdk": "0.0.9",
"@fern-docs/search-server": "workspace:*",
"@prisma/client": "5.13.0",
"@sentry/cli": "^2.31.0",
"@sentry/node": "^7.112.2",
Expand Down Expand Up @@ -73,29 +97,5 @@
"tsx": "^4.7.1",
"typescript": "^5",
"vitest": "^2.1.4"
},
"scripts": {
"compile": "tsc --build",
"codegen": "prisma generate",
"db:migrate:dev": "dotenv -e .env.dev -- prisma migrate deploy",
"db:migrate:local": "dotenv -e .env.migrate -- prisma migrate dev",
"db:migrate:prod": "dotenv -e .env.prod -- prisma migrate deploy",
"db:up:local": "docker-compose -f docker-compose.local.yml up -d",
"db:down:local": "docker-compose -f docker-compose.local.yml down",
"dev": "tsx src/server.ts --watch",
"devjs": "node --experimental-specifier-resolution=node dist/server.js",
"clean": "rm -rf ./dist && tsc --build --clean",
"format": "prettier --write --ignore-unknown \"**\"",
"format:check": "prettier --check --ignore-unknown \"**\"",
"format:prisma": "prisma format",
"docker:local": "dotenv -e .env.test -- ./create_docker.sh local",
"docker:dev": "dotenv -e .env.dev -- ./create_docker.sh",
"docker:prod": "dotenv -e .env.prod -- ./create_docker.sh",
"test": "vitest --run src/** --globals",
"test:update": "vitest --run src/** --globals -u",
"lint:eslint": "eslint --max-warnings 0 .",
"lint:eslint:fix": "pnpm lint:eslint --fix",
"test:local": "dotenv -e .env.test -- vitest src/__test__/local --globals --config src/__test__/local/vitest.config.ts --no-file-parallelism",
"test:ete": "dotenv -e .env.ete -- vitest src/__test__/ete --globals --config src/__test__/ete/vitest.config.ts"
}
}
Loading

0 comments on commit cc8c896

Please sign in to comment.