Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

chore: migrate to oxfmt

Mohamed Bassem85e63aecb315
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
new file mode 100644
index 00000000..34db147d
--- /dev/null
+++ b/.oxfmtrc.json
@@ -0,0 +1,54 @@
+{
+ "$schema": "./node_modules/oxfmt/configuration_schema.json",
+ "sortTailwindcss": {
+ "config": "tooling/tailwind/web.ts",
+ "functions": [
+ "cn",
+ "cva"
+ ]
+ },
+ "importOrder": [
+ "<TYPES>",
+ "^(react/(.*)$)|^(react$)|^(react-native(.*)$)",
+ "^(next/(.*)$)|^(next$)",
+ "^(expo(.*)$)|^(expo$)",
+ "<THIRD_PARTY_MODULES>",
+ "",
+ "<TYPES>^@karakeep",
+ "^@karakeep/(.*)$",
+ "",
+ "<TYPES>^[.|..|~]",
+ "^~/",
+ "^[../]",
+ "^[./]"
+ ],
+ "importOrderParserPlugins": [
+ "typescript",
+ "jsx",
+ "decorators-legacy"
+ ],
+ "importOrderTypeScriptVersion": "4.4.0",
+ "printWidth": 80,
+ "sortPackageJson": false,
+ "ignorePatterns": [
+ ".next",
+ "build",
+ "coverage",
+ ".vscode*",
+ "node_modules",
+ "dist",
+ "*.md",
+ "*.json",
+ ".env",
+ ".env.*",
+ "**/migrations/**",
+ "packages/open-api/karakeep-openapi-spec.json",
+ "apps/web/public/workbox-*.js",
+ "pnpm-lock.yaml",
+ "package-lock.json",
+ "yarn.lock",
+ "**/.expo/**",
+ "apps/mobile/android",
+ "apps/mobile/ios"
+ ]
+}
diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index 0613380e..00000000
--- a/.prettierignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Ignore artifacts:
-.next
-build
-coverage
-.vscode*
-node_modules
-dist
-*.md
-*.json
-.env
-.env.*
-**/migrations/**
-packages/open-api/karakeep-openapi-spec.json
-
-# Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
-package-lock.json
-yarn.lock
-
-# Expo build
-**/.expo/**
-
-apps/mobile/android
-apps/mobile/ios
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index b4bfed35..00000000
--- a/.prettierrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "plugins": ["prettier-plugin-tailwindcss"]
-}
diff --git a/AGENTS.md b/AGENTS.md
index d8f6d862..6979ed41 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -9,7 +9,7 @@ Karakeep is a monorepo project managed with Turborepo. It appears to be a web ap
- **Frontend:** Next.js, React, TypeScript, Tailwind CSS
- **Backend:** Hono (a lightweight web framework), tRPC
- **Database:** Drizzle ORM (likely with a relational database like PostgreSQL or SQLite)
-- **Tooling:** Prettier,oxlint, Vitest, pnpm
+- **Tooling:** Oxfmt, oxlint, Vitest, pnpm
## Project Structure
@@ -45,7 +45,7 @@ The project is organized into `apps` and `packages`:
- **Package Manager:** pnpm
- **Build System:** Turborepo
-- **Code Formatting:** Prettier
+- **Code Formatting:** Oxfmt
- **Linting:** oxlint
- **Testing:** Vitest
diff --git a/apps/browser-extension/.oxlintrc.json b/apps/browser-extension/.oxlintrc.json
index 3c21fbb0..3c34ad83 100644
--- a/apps/browser-extension/.oxlintrc.json
+++ b/apps/browser-extension/.oxlintrc.json
@@ -16,7 +16,7 @@
},
"settings": {
"react": {
- "version": "detect"
+ "version": "19"
}
},
"ignorePatterns": [
diff --git a/apps/browser-extension/package.json b/apps/browser-extension/package.json
index cfab1572..95d55834 100644
--- a/apps/browser-extension/package.json
+++ b/apps/browser-extension/package.json
@@ -6,8 +6,8 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
- "format": "prettier . --cache --check",
- "format:fix": "prettier . --cache --write",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"preview": "vite preview",
@@ -42,7 +42,6 @@
},
"devDependencies": {
"@crxjs/vite-plugin": "2.2.0",
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tailwind-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@types/chrome": "^0.0.260",
@@ -54,6 +53,5 @@
"tailwindcss": "^3.4.1",
"typescript": "^5.9",
"vite": "^7.0.6"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/apps/browser-extension/src/components/ui/badge.tsx b/apps/browser-extension/src/components/ui/badge.tsx
index 0b043596..3ccd0a77 100644
--- a/apps/browser-extension/src/components/ui/badge.tsx
+++ b/apps/browser-extension/src/components/ui/badge.tsx
@@ -25,7 +25,8 @@ const badgeVariants = cva(
);
export interface BadgeProps
- extends React.HTMLAttributes<HTMLDivElement>,
+ extends
+ React.HTMLAttributes<HTMLDivElement>,
VariantProps<typeof badgeVariants> {}
function Badge({ className, variant, ...props }: BadgeProps) {
diff --git a/apps/browser-extension/src/components/ui/button.tsx b/apps/browser-extension/src/components/ui/button.tsx
index 1bd3802d..f2e808c8 100644
--- a/apps/browser-extension/src/components/ui/button.tsx
+++ b/apps/browser-extension/src/components/ui/button.tsx
@@ -35,7 +35,8 @@ const buttonVariants = cva(
);
export interface ButtonProps
- extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+ extends
+ React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean;
}
diff --git a/apps/browser-extension/src/components/ui/dialog.tsx b/apps/browser-extension/src/components/ui/dialog.tsx
index 997230bb..ad64f2e1 100644
--- a/apps/browser-extension/src/components/ui/dialog.tsx
+++ b/apps/browser-extension/src/components/ui/dialog.tsx
@@ -19,7 +19,7 @@ const DialogOverlay = React.forwardRef<
<DialogPrimitive.Overlay
ref={ref}
className={cn(
- "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+ "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
className,
)}
{...props}
diff --git a/apps/browser-extension/src/components/ui/dynamic-popover.tsx b/apps/browser-extension/src/components/ui/dynamic-popover.tsx
index a6ced127..6feb8094 100644
--- a/apps/browser-extension/src/components/ui/dynamic-popover.tsx
+++ b/apps/browser-extension/src/components/ui/dynamic-popover.tsx
@@ -3,8 +3,9 @@ import * as PopoverPrimitive from "@radix-ui/react-popover";
import { cn } from "../../utils/css";
-interface DynamicPopoverContentProps
- extends React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content> {
+interface DynamicPopoverContentProps extends React.ComponentPropsWithoutRef<
+ typeof PopoverPrimitive.Content
+> {
/**
* Whether to enable dynamic height adjustment
* If true, use max-h when content can fit the viewport, otherwise use fixed height
diff --git a/apps/cli/package.json b/apps/cli/package.json
index ef977a08..ca9c609a 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -16,7 +16,6 @@
},
"devDependencies": {
"@commander-js/extra-typings": "^12.0.1",
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/shared": "workspace:^0.1.0",
"@karakeep/trpc": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
@@ -36,14 +35,13 @@
"run": "tsx src/index.ts",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
},
"repository": {
"type": "git",
"url": "git+https://github.com/karakeep-app/karakeep.git",
"directory": "apps/cli"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/apps/landing/.oxlintrc.json b/apps/landing/.oxlintrc.json
index 3c21fbb0..3c34ad83 100644
--- a/apps/landing/.oxlintrc.json
+++ b/apps/landing/.oxlintrc.json
@@ -16,7 +16,7 @@
},
"settings": {
"react": {
- "version": "detect"
+ "version": "19"
}
},
"ignorePatterns": [
diff --git a/apps/landing/components/ui/button.tsx b/apps/landing/components/ui/button.tsx
index 9404e429..9ed0ca5b 100644
--- a/apps/landing/components/ui/button.tsx
+++ b/apps/landing/components/ui/button.tsx
@@ -34,7 +34,8 @@ const buttonVariants = cva(
);
export interface ButtonProps
- extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+ extends
+ React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean;
}
diff --git a/apps/landing/package.json b/apps/landing/package.json
index 367fa688..9ed2a3fb 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -10,8 +10,8 @@
"preview": "vite preview",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --ignore-path ../../.prettierignore --write",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
},
"dependencies": {
@@ -28,7 +28,6 @@
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tailwind-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@tailwindcss/typography": "^0.5.10",
@@ -40,6 +39,5 @@
"tailwindcss": "^3.4.1",
"vite": "^7.0.6",
"vite-plugin-svgr": "^4.3.0"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/apps/mcp/package.json b/apps/mcp/package.json
index c908c187..d1f81c47 100644
--- a/apps/mcp/package.json
+++ b/apps/mcp/package.json
@@ -14,7 +14,6 @@
"karakeep-mcp": "dist/index.js"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@tsconfig/node22": "^22.0.0",
"@types/turndown": "^5.0.5",
@@ -27,8 +26,8 @@
"run": "tsx src/index.ts",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
},
"repository": {
@@ -36,7 +35,6 @@
"url": "git+https://github.com/karakeep-app/karakeep.git",
"directory": "apps/mcp"
},
- "prettier": "@karakeep/prettier-config",
"dependencies": {
"@karakeep/sdk": "workspace:*",
"@modelcontextprotocol/sdk": "^1.9.0",
diff --git a/apps/mobile/.oxlintrc.json b/apps/mobile/.oxlintrc.json
index fa024bec..75bcf00e 100644
--- a/apps/mobile/.oxlintrc.json
+++ b/apps/mobile/.oxlintrc.json
@@ -16,7 +16,7 @@
},
"settings": {
"react": {
- "version": "detect"
+ "version": "19"
}
},
"ignorePatterns": [
diff --git a/apps/mobile/components/ui/SearchInput/SearchInput.ios.tsx b/apps/mobile/components/ui/SearchInput/SearchInput.ios.tsx
index 1a767675..2484e56c 100644
--- a/apps/mobile/components/ui/SearchInput/SearchInput.ios.tsx
+++ b/apps/mobile/components/ui/SearchInput/SearchInput.ios.tsx
@@ -147,7 +147,7 @@ const SearchInput = React.forwardRef<
placeholder={placeholder}
className={cn(
!showCancel && "active:bg-muted/5 dark:active:bg-muted/20",
- "flex-1 rounded-lg py-2 pl-8 pr-1 text-[17px] text-foreground",
+ "flex-1 rounded-lg py-2 pl-8 pr-1 text-[17px] text-foreground",
className,
)}
value={value}
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index d4b85290..16f8637e 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -8,8 +8,8 @@
"android": "expo run:android",
"ios": "expo run:ios",
"web": "expo start --web",
- "format": "prettier . --cache --check",
- "format:fix": "prettier . --cache --write",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"typecheck": "tsc --noEmit"
@@ -76,15 +76,12 @@
},
"devDependencies": {
"@babel/core": "~7.26.0",
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tailwind-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@types/react": "^19.2.14",
"ajv": "latest",
- "prettier": "^3.4.2",
"tailwindcss": "^3.4.1",
"typescript": "^5.9"
},
- "private": true,
- "prettier": "@karakeep/prettier-config"
+ "private": true
}
diff --git a/apps/web/.oxlintrc.json b/apps/web/.oxlintrc.json
index 4c437efb..651952c2 100644
--- a/apps/web/.oxlintrc.json
+++ b/apps/web/.oxlintrc.json
@@ -17,7 +17,7 @@
},
"settings": {
"react": {
- "version": "detect"
+ "version": "19"
}
},
"ignorePatterns": [
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx b/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx
index a1eab830..6382e841 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx
@@ -1,50 +1,50 @@
-import MarkdownEditor from "@/components/ui/markdown/markdown-editor";
-import { MarkdownReadonly } from "@/components/ui/markdown/markdown-readonly";
-import { toast } from "@/components/ui/sonner";
-
-import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks";
-
-export function BookmarkMarkdownComponent({
- children: bookmark,
- readOnly = true,
-}: {
- children: {
- id: string;
- content: {
- text: string;
- };
- };
- readOnly?: boolean;
-}) {
- const { mutate: updateBookmarkMutator, isPending } = useUpdateBookmark({
- onSuccess: () => {
- toast({
- description: "Note updated!",
- });
- },
- onError: () => {
- toast({ description: "Something went wrong", variant: "destructive" });
- },
- });
-
- const onSave = (text: string) => {
- updateBookmarkMutator({
- bookmarkId: bookmark.id,
- text,
- });
- };
-
- return (
- <div className="h-full">
- {readOnly ? (
- <MarkdownReadonly onSave={onSave}>
- {bookmark.content.text}
- </MarkdownReadonly>
- ) : (
- <MarkdownEditor onSave={onSave} isSaving={isPending}>
- {bookmark.content.text}
- </MarkdownEditor>
- )}
- </div>
- );
-}
+import MarkdownEditor from "@/components/ui/markdown/markdown-editor";
+import { MarkdownReadonly } from "@/components/ui/markdown/markdown-readonly";
+import { toast } from "@/components/ui/sonner";
+
+import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks";
+
+export function BookmarkMarkdownComponent({
+ children: bookmark,
+ readOnly = true,
+}: {
+ children: {
+ id: string;
+ content: {
+ text: string;
+ };
+ };
+ readOnly?: boolean;
+}) {
+ const { mutate: updateBookmarkMutator, isPending } = useUpdateBookmark({
+ onSuccess: () => {
+ toast({
+ description: "Note updated!",
+ });
+ },
+ onError: () => {
+ toast({ description: "Something went wrong", variant: "destructive" });
+ },
+ });
+
+ const onSave = (text: string) => {
+ updateBookmarkMutator({
+ bookmarkId: bookmark.id,
+ text,
+ });
+ };
+
+ return (
+ <div className="h-full">
+ {readOnly ? (
+ <MarkdownReadonly onSave={onSave}>
+ {bookmark.content.text}
+ </MarkdownReadonly>
+ ) : (
+ <MarkdownEditor onSave={onSave} isSaving={isPending}>
+ {bookmark.content.text}
+ </MarkdownEditor>
+ )}
+ </div>
+ );
+}
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx b/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx
index dd7d1afa..50d214ef 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx
@@ -311,9 +311,9 @@ export default function BookmarkOptions({ bookmark }: { bookmark: ZBookmark }) {
(withinListContext &&
(withinListContext.userRole === "editor" ||
withinListContext.userRole === "owner"))) &&
- !!listId &&
- !!withinListContext &&
- withinListContext.type === "manual",
+ !!listId &&
+ !!withinListContext &&
+ withinListContext.type === "manual",
),
disabled: demoMode,
onClick: () =>
diff --git a/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx b/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx
index 5f107663..9cfaef5f 100644
--- a/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx
+++ b/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx
@@ -46,12 +46,7 @@ function AISummary({
<div className="w-full p-1">
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
<div
- className={`
- relative overflow-hidden rounded-lg p-4
- transition-all duration-300 ease-in-out
- ${isExpanded ? "h-auto" : "cursor-pointer"}
- bg-gradient-to-r from-purple-400 via-pink-500 to-red-500 p-[2px]
- `}
+ className={`relative overflow-hidden rounded-lg p-4 transition-all duration-300 ease-in-out ${isExpanded ? "h-auto" : "cursor-pointer"} bg-gradient-to-r from-purple-400 via-pink-500 to-red-500 p-[2px]`}
onClick={() => !isExpanded && setIsExpanded(true)}
>
<div className="h-full rounded-lg bg-accent p-2">
diff --git a/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx b/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx
index 48d3c7ac..0fcdd0fe 100644
--- a/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx
+++ b/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx
@@ -6,8 +6,10 @@ import { useQuery } from "@tanstack/react-query";
import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks";
import { useTRPC } from "@karakeep/shared-react/trpc";
-interface ArchiveBookmarkButtonProps
- extends Omit<ActionButtonProps, "loading" | "disabled"> {
+interface ArchiveBookmarkButtonProps extends Omit<
+ ActionButtonProps,
+ "loading" | "disabled"
+> {
bookmarkId: string;
onDone?: () => void;
}
diff --git a/apps/web/components/dashboard/search/useSearchAutocomplete.ts b/apps/web/components/dashboard/search/useSearchAutocomplete.ts
index 8afc50e4..1885f19b 100644
--- a/apps/web/components/dashboard/search/useSearchAutocomplete.ts
+++ b/apps/web/components/dashboard/search/useSearchAutocomplete.ts
@@ -104,7 +104,7 @@ const QUALIFIER_DEFINITIONS = [
value: "source:",
descriptionKey: "search.is_from_source",
},
-] satisfies ReadonlyArray<QualifierDefinition>;
+] satisfies readonly QualifierDefinition[];
export interface AutocompleteSuggestionItem {
type: "token" | "tag" | "list" | "feed" | "source";
diff --git a/apps/web/components/public/lists/PublicListHeader.tsx b/apps/web/components/public/lists/PublicListHeader.tsx
index acdb845a..fa0cccfa 100644
--- a/apps/web/components/public/lists/PublicListHeader.tsx
+++ b/apps/web/components/public/lists/PublicListHeader.tsx
@@ -17,7 +17,7 @@ export default function PublicListHeader({
}) {
const rssLink = `/api/v1/rss/lists/${list.id}`;
return (
- <div className="rounded-lg border bg-gradient-to-br from-purple-50/50 via-purple-100/30 to-purple-200/40 p-6 transition-all duration-300 dark:from-purple-950/20 dark:via-purple-900/15 dark:to-purple-800/20">
+ <div className="rounded-lg border bg-gradient-to-br from-purple-50/50 via-purple-100/30 to-purple-200/40 p-6 transition-all duration-300 dark:from-purple-950/20 dark:via-purple-900/15 dark:to-purple-800/20">
<div className="space-y-4">
<KarakeepLogo height={38} />
<div className="flex flex-col items-start justify-between gap-6 md:flex-row md:items-center">
diff --git a/apps/web/components/ui/badge.tsx b/apps/web/components/ui/badge.tsx
index 7950a5ee..e8f4a458 100644
--- a/apps/web/components/ui/badge.tsx
+++ b/apps/web/components/ui/badge.tsx
@@ -24,7 +24,8 @@ const badgeVariants = cva(
);
export interface BadgeProps
- extends React.HTMLAttributes<HTMLDivElement>,
+ extends
+ React.HTMLAttributes<HTMLDivElement>,
VariantProps<typeof badgeVariants> {}
function Badge({ className, variant, ...props }: BadgeProps) {
diff --git a/apps/web/components/ui/copy-button.tsx b/apps/web/components/ui/copy-button.tsx
index fb1f943f..34045ee3 100644
--- a/apps/web/components/ui/copy-button.tsx
+++ b/apps/web/components/ui/copy-button.tsx
@@ -1,76 +1,76 @@
-import React, { useEffect, useState } from "react";
-import { toast } from "@/components/ui/sonner";
-import { cn } from "@/lib/utils";
-import { Check, Copy } from "lucide-react";
-
-import { Button } from "./button";
-
-export default function CopyBtn({
- className,
- getStringToCopy,
-}: {
- className?: string;
- getStringToCopy: () => string;
-}) {
- const [copyOk, setCopyOk] = React.useState(false);
- const [disabled, setDisabled] = React.useState(false);
- useEffect(() => {
- if (!navigator || !navigator.clipboard) {
- setDisabled(true);
- }
- });
-
- const handleClick = async () => {
- await navigator.clipboard.writeText(getStringToCopy());
- setCopyOk(true);
- setTimeout(() => {
- setCopyOk(false);
- }, 2000);
- };
-
- return (
- <button
- className={className}
- onClick={handleClick}
- disabled={disabled}
- title={disabled ? "Copying is only available over https" : undefined}
- >
- {copyOk ? <Check /> : <Copy />}
- </button>
- );
-}
-
-export function CopyBtnV2({
- className,
- getStringToCopy,
-}: {
- className?: string;
- getStringToCopy: () => string;
-}) {
- const [copied, setCopied] = useState(false);
-
- const handleCopy = async (url: string) => {
- try {
- await navigator.clipboard.writeText(url);
- setCopied(true);
- setTimeout(() => setCopied(false), 2000);
- } catch {
- toast({
- description:
- "Failed to copy link. Browsers only support copying to the clipboard from https pages.",
- variant: "destructive",
- });
- }
- };
-
- return (
- <Button
- size="sm"
- variant="outline"
- onClick={() => handleCopy(getStringToCopy())}
- className={cn("shrink-0", className)}
- >
- {copied ? <Check className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
- </Button>
- );
-}
+import React, { useEffect, useState } from "react";
+import { toast } from "@/components/ui/sonner";
+import { cn } from "@/lib/utils";
+import { Check, Copy } from "lucide-react";
+
+import { Button } from "./button";
+
+export default function CopyBtn({
+ className,
+ getStringToCopy,
+}: {
+ className?: string;
+ getStringToCopy: () => string;
+}) {
+ const [copyOk, setCopyOk] = React.useState(false);
+ const [disabled, setDisabled] = React.useState(false);
+ useEffect(() => {
+ if (!navigator || !navigator.clipboard) {
+ setDisabled(true);
+ }
+ });
+
+ const handleClick = async () => {
+ await navigator.clipboard.writeText(getStringToCopy());
+ setCopyOk(true);
+ setTimeout(() => {
+ setCopyOk(false);
+ }, 2000);
+ };
+
+ return (
+ <button
+ className={className}
+ onClick={handleClick}
+ disabled={disabled}
+ title={disabled ? "Copying is only available over https" : undefined}
+ >
+ {copyOk ? <Check /> : <Copy />}
+ </button>
+ );
+}
+
+export function CopyBtnV2({
+ className,
+ getStringToCopy,
+}: {
+ className?: string;
+ getStringToCopy: () => string;
+}) {
+ const [copied, setCopied] = useState(false);
+
+ const handleCopy = async (url: string) => {
+ try {
+ await navigator.clipboard.writeText(url);
+ setCopied(true);
+ setTimeout(() => setCopied(false), 2000);
+ } catch {
+ toast({
+ description:
+ "Failed to copy link. Browsers only support copying to the clipboard from https pages.",
+ variant: "destructive",
+ });
+ }
+ };
+
+ return (
+ <Button
+ size="sm"
+ variant="outline"
+ onClick={() => handleCopy(getStringToCopy())}
+ className={cn("shrink-0", className)}
+ >
+ {copied ? <Check className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
+ </Button>
+ );
+}
diff --git a/apps/web/components/ui/dialog.tsx b/apps/web/components/ui/dialog.tsx
index 18795408..44524169 100644
--- a/apps/web/components/ui/dialog.tsx
+++ b/apps/web/components/ui/dialog.tsx
@@ -20,7 +20,7 @@ const DialogOverlay = React.forwardRef<
<DialogPrimitive.Overlay
ref={ref}
className={cn(
- "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+ "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
className,
)}
{...props}
diff --git a/apps/web/components/ui/input.tsx b/apps/web/components/ui/input.tsx
index 66cd1108..2f4b76ea 100644
--- a/apps/web/components/ui/input.tsx
+++ b/apps/web/components/ui/input.tsx
@@ -1,8 +1,7 @@
import * as React from "react";
import { cn } from "@/lib/utils";
-export interface InputProps
- extends React.InputHTMLAttributes<HTMLInputElement> {
+export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
startIcon?: React.ReactNode;
endIcon?: React.ReactNode;
}
diff --git a/apps/web/lib/drag-and-drop.ts b/apps/web/lib/drag-and-drop.ts
index ec37e810..19ab0f0b 100644
--- a/apps/web/lib/drag-and-drop.ts
+++ b/apps/web/lib/drag-and-drop.ts
@@ -42,7 +42,7 @@ export function useDragAndDrop(
const dragTargetId = findTargetId(target as HTMLElement);
if (dragTargetId) {
- /* As Draggable tries to setState when the
+ /* As Draggable tries to setState when the
component is unmounted, it is needed to
push onCombine to the event loop queue.
onCombine would be run after setState on
diff --git a/apps/web/package.json b/apps/web/package.json
index d62f705e..9c3a2947 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -13,8 +13,8 @@
"lint:fix": "oxlint . --fix",
"test": "vitest",
"typecheck": "tsc --noEmit",
- "format": "prettier --cache --check . --ignore-path ../../.gitignore",
- "format:fix": "prettier --cache --write . --ignore-path ../../.gitignore"
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt ."
},
"dependencies": {
"@auth/drizzle-adapter": "~1.5.0",
@@ -77,7 +77,6 @@
"next-pwa": "^5.6.0",
"next-themes": "^0.4.6",
"nuqs": "^2.4.3",
- "prettier": "^3.4.2",
"react": "^19.2.1",
"react-day-picker": "^9.7.0",
"react-dom": "^19.2.1",
@@ -104,7 +103,6 @@
"zustand": "^5.0.5"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tailwind-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@next/bundle-analyzer": "15.3.8",
@@ -119,6 +117,5 @@
"tailwindcss": "^3.4.1",
"vite-tsconfig-paths": "^4.3.1",
"vitest": "^3.2.4"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/apps/workers/package.json b/apps/workers/package.json
index e43f55f7..5c7277f9 100644
--- a/apps/workers/package.json
+++ b/apps/workers/package.json
@@ -59,7 +59,6 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@types/archiver": "^7.0.0",
"@types/jsdom": "^21.1.6",
"@types/node-cron": "^3.0.11",
@@ -72,9 +71,8 @@
"build:watch": "tsdown --watch",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --ignore-path ../../.prettierignore --write",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/apps/workers/workerUtils.ts b/apps/workers/workerUtils.ts
index 48e3b277..77b50009 100644
--- a/apps/workers/workerUtils.ts
+++ b/apps/workers/workerUtils.ts
@@ -1,57 +1,57 @@
-import { eq } from "drizzle-orm";
-
-import { db, KarakeepDBTransaction } from "@karakeep/db";
-import { assets, AssetTypes, bookmarks } from "@karakeep/db/schema";
-
-type DBAssetType = typeof assets.$inferInsert;
-export async function updateAsset(
- oldAssetId: string | undefined,
- newAsset: DBAssetType,
- txn: KarakeepDBTransaction,
-) {
- if (oldAssetId) {
- await txn.delete(assets).where(eq(assets.id, oldAssetId));
- }
-
- await txn.insert(assets).values(newAsset);
-}
-
-export async function getBookmarkDetails(bookmarkId: string) {
- const bookmark = await db.query.bookmarks.findFirst({
- where: eq(bookmarks.id, bookmarkId),
- with: {
- link: true,
- assets: true,
- },
- });
-
- if (!bookmark || !bookmark.link) {
- throw new Error("The bookmark either doesn't exist or is not a link");
- }
- return {
- url: bookmark.link.url,
- userId: bookmark.userId,
- createdAt: bookmark.createdAt,
- crawledAt: bookmark.link.crawledAt,
- screenshotAssetId: bookmark.assets.find(
- (a) => a.assetType == AssetTypes.LINK_SCREENSHOT,
- )?.id,
- pdfAssetId: bookmark.assets.find((a) => a.assetType == AssetTypes.LINK_PDF)
- ?.id,
- imageAssetId: bookmark.assets.find(
- (a) => a.assetType == AssetTypes.LINK_BANNER_IMAGE,
- )?.id,
- fullPageArchiveAssetId: bookmark.assets.find(
- (a) => a.assetType == AssetTypes.LINK_FULL_PAGE_ARCHIVE,
- )?.id,
- videoAssetId: bookmark.assets.find(
- (a) => a.assetType == AssetTypes.LINK_VIDEO,
- )?.id,
- precrawledArchiveAssetId: bookmark.assets
- .filter((a) => a.assetType == AssetTypes.LINK_PRECRAWLED_ARCHIVE)
- .at(-1)?.id,
- contentAssetId: bookmark.assets.find(
- (a) => a.assetType == AssetTypes.LINK_HTML_CONTENT,
- )?.id,
- };
-}
+import { eq } from "drizzle-orm";
+
+import { db, KarakeepDBTransaction } from "@karakeep/db";
+import { assets, AssetTypes, bookmarks } from "@karakeep/db/schema";
+
+type DBAssetType = typeof assets.$inferInsert;
+export async function updateAsset(
+ oldAssetId: string | undefined,
+ newAsset: DBAssetType,
+ txn: KarakeepDBTransaction,
+) {
+ if (oldAssetId) {
+ await txn.delete(assets).where(eq(assets.id, oldAssetId));
+ }
+
+ await txn.insert(assets).values(newAsset);
+}
+
+export async function getBookmarkDetails(bookmarkId: string) {
+ const bookmark = await db.query.bookmarks.findFirst({
+ where: eq(bookmarks.id, bookmarkId),
+ with: {
+ link: true,
+ assets: true,
+ },
+ });
+
+ if (!bookmark || !bookmark.link) {
+ throw new Error("The bookmark either doesn't exist or is not a link");
+ }
+ return {
+ url: bookmark.link.url,
+ userId: bookmark.userId,
+ createdAt: bookmark.createdAt,
+ crawledAt: bookmark.link.crawledAt,
+ screenshotAssetId: bookmark.assets.find(
+ (a) => a.assetType == AssetTypes.LINK_SCREENSHOT,
+ )?.id,
+ pdfAssetId: bookmark.assets.find((a) => a.assetType == AssetTypes.LINK_PDF)
+ ?.id,
+ imageAssetId: bookmark.assets.find(
+ (a) => a.assetType == AssetTypes.LINK_BANNER_IMAGE,
+ )?.id,
+ fullPageArchiveAssetId: bookmark.assets.find(
+ (a) => a.assetType == AssetTypes.LINK_FULL_PAGE_ARCHIVE,
+ )?.id,
+ videoAssetId: bookmark.assets.find(
+ (a) => a.assetType == AssetTypes.LINK_VIDEO,
+ )?.id,
+ precrawledArchiveAssetId: bookmark.assets
+ .filter((a) => a.assetType == AssetTypes.LINK_PRECRAWLED_ARCHIVE)
+ .at(-1)?.id,
+ contentAssetId: bookmark.assets.find(
+ (a) => a.assetType == AssetTypes.LINK_HTML_CONTENT,
+ )?.id,
+ };
+}
diff --git a/apps/workers/workers/videoWorker.ts b/apps/workers/workers/videoWorker.ts
index 1ffbf674..b1e51833 100644
--- a/apps/workers/workers/videoWorker.ts
+++ b/apps/workers/workers/videoWorker.ts
@@ -1,266 +1,266 @@
-import fs from "fs";
-import * as os from "os";
-import path from "path";
-import { execa } from "execa";
-import { workerStatsCounter } from "metrics";
-import { getProxyAgent, validateUrl } from "network";
-import { withWorkerTracing } from "workerTracing";
-
-import { db } from "@karakeep/db";
-import { AssetTypes } from "@karakeep/db/schema";
-import {
- QuotaService,
- StorageQuotaError,
- VideoWorkerQueue,
- ZVideoRequest,
- zvideoRequestSchema,
-} from "@karakeep/shared-server";
-import {
- ASSET_TYPES,
- newAssetId,
- saveAssetFromFile,
- silentDeleteAsset,
-} from "@karakeep/shared/assetdb";
-import serverConfig from "@karakeep/shared/config";
-import logger from "@karakeep/shared/logger";
-import { DequeuedJob, getQueueClient } from "@karakeep/shared/queueing";
-
-import { getBookmarkDetails, updateAsset } from "../workerUtils";
-
-const TMP_FOLDER = path.join(os.tmpdir(), "video_downloads");
-
-export class VideoWorker {
- static async build() {
- logger.info("Starting video worker ...");
-
- return (await getQueueClient())!.createRunner<ZVideoRequest>(
- VideoWorkerQueue,
- {
- run: withWorkerTracing("videoWorker.run", runWorker),
- onComplete: async (job) => {
- workerStatsCounter.labels("video", "completed").inc();
- const jobId = job.id;
- logger.info(
- `[VideoCrawler][${jobId}] Video Download Completed successfully`,
- );
- return Promise.resolve();
- },
- onError: async (job) => {
- workerStatsCounter.labels("video", "failed").inc();
- if (job.numRetriesLeft == 0) {
- workerStatsCounter.labels("video", "failed_permanent").inc();
- }
- const jobId = job.id;
- logger.error(
- `[VideoCrawler][${jobId}] Video Download job failed: ${job.error}`,
- );
- return Promise.resolve();
- },
- },
- {
- pollIntervalMs: 1000,
- timeoutSecs: serverConfig.crawler.downloadVideoTimeout,
- concurrency: 1,
- validator: zvideoRequestSchema,
- },
- );
- }
-}
-
-function prepareYtDlpArguments(
- url: string,
- proxy: string | undefined,
- assetPath: string,
-) {
- const ytDlpArguments = [url];
- if (serverConfig.crawler.maxVideoDownloadSize > 0) {
- ytDlpArguments.push(
- "-f",
- `best[filesize<${serverConfig.crawler.maxVideoDownloadSize}M]`,
- );
- }
-
- ytDlpArguments.push(...serverConfig.crawler.ytDlpArguments);
- ytDlpArguments.push("-o", assetPath);
- ytDlpArguments.push("--no-playlist");
- if (proxy) {
- ytDlpArguments.push("--proxy", proxy);
- }
- return ytDlpArguments;
-}
-
-async function runWorker(job: DequeuedJob<ZVideoRequest>) {
- const jobId = job.id;
- const { bookmarkId } = job.data;
-
- const {
- url,
- userId,
- videoAssetId: oldVideoAssetId,
- } = await getBookmarkDetails(bookmarkId);
-
- if (!serverConfig.crawler.downloadVideo) {
- logger.info(
- `[VideoCrawler][${jobId}] Skipping video download from "${url}", because it is disabled in the config.`,
- );
- return;
- }
-
- const proxy = getProxyAgent(url);
- const validation = await validateUrl(url, !!proxy);
- if (!validation.ok) {
- logger.warn(
- `[VideoCrawler][${jobId}] Skipping video download to disallowed URL "${url}": ${validation.reason}`,
- );
- return;
- }
- const normalizedUrl = validation.url.toString();
-
- const videoAssetId = newAssetId();
- let assetPath = `${TMP_FOLDER}/${videoAssetId}`;
- await fs.promises.mkdir(TMP_FOLDER, { recursive: true });
-
- const ytDlpArguments = prepareYtDlpArguments(
- normalizedUrl,
- proxy?.proxy.toString(),
- assetPath,
- );
-
- try {
- logger.info(
- `[VideoCrawler][${jobId}] Attempting to download a file from "${normalizedUrl}" to "${assetPath}" using the following arguments: "${ytDlpArguments}"`,
- );
-
- await execa("yt-dlp", ytDlpArguments, {
- cancelSignal: job.abortSignal,
- });
- const downloadPath = await findAssetFile(videoAssetId);
- if (!downloadPath) {
- logger.info(
- "[VideoCrawler][${jobId}] yt-dlp didn't download anything. Skipping ...",
- );
- return;
- }
- assetPath = downloadPath;
- } catch (e) {
- const err = e as Error;
- if (
- err.message.includes("ERROR: Unsupported URL:") ||
- err.message.includes("No media found")
- ) {
- logger.info(
- `[VideoCrawler][${jobId}] Skipping video download from "${normalizedUrl}", because it's not one of the supported yt-dlp URLs`,
- );
- return;
- }
- const genericError = `[VideoCrawler][${jobId}] Failed to download a file from "${normalizedUrl}" to "${assetPath}"`;
- if ("stderr" in err) {
- logger.error(`${genericError}: ${err.stderr}`);
- } else {
- logger.error(genericError);
- }
- await deleteLeftOverAssetFile(jobId, videoAssetId);
- return;
- }
-
- logger.info(
- `[VideoCrawler][${jobId}] Finished downloading a file from "${normalizedUrl}" to "${assetPath}"`,
- );
-
- // Get file size and check quota before saving
- const stats = await fs.promises.stat(assetPath);
- const fileSize = stats.size;
-
- try {
- const quotaApproved = await QuotaService.checkStorageQuota(
- db,
- userId,
- fileSize,
- );
-
- await saveAssetFromFile({
- userId,
- assetId: videoAssetId,
- assetPath,
- metadata: { contentType: ASSET_TYPES.VIDEO_MP4 },
- quotaApproved,
- });
-
- await db.transaction(async (txn) => {
- await updateAsset(
- oldVideoAssetId,
- {
- id: videoAssetId,
- bookmarkId,
- userId,
- assetType: AssetTypes.LINK_VIDEO,
- contentType: ASSET_TYPES.VIDEO_MP4,
- size: fileSize,
- },
- txn,
- );
- });
- await silentDeleteAsset(userId, oldVideoAssetId);
-
- logger.info(
- `[VideoCrawler][${jobId}] Finished downloading video from "${normalizedUrl}" and adding it to the database`,
- );
- } catch (error) {
- if (error instanceof StorageQuotaError) {
- logger.warn(
- `[VideoCrawler][${jobId}] Skipping video storage due to quota exceeded: ${error.message}`,
- );
- await deleteLeftOverAssetFile(jobId, videoAssetId);
- return;
- }
- throw error;
- }
-}
-
-/**
- * Deletes leftover assets in case the download fails
- *
- * @param jobId the id of the job
- * @param assetId the id of the asset to delete
- */
-async function deleteLeftOverAssetFile(
- jobId: string,
- assetId: string,
-): Promise<void> {
- let assetFile;
- try {
- assetFile = await findAssetFile(assetId);
- } catch {
- // ignore exception, no asset file was found
- return;
- }
- if (!assetFile) {
- return;
- }
- logger.info(
- `[VideoCrawler][${jobId}] Deleting leftover video asset "${assetFile}".`,
- );
- try {
- await fs.promises.rm(assetFile);
- } catch {
- logger.error(
- `[VideoCrawler][${jobId}] Failed deleting leftover video asset "${assetFile}".`,
- );
- }
-}
-
-/**
- * yt-dlp automatically adds a file ending to the passed in filename --> we have to search it again in the folder
- *
- * @param assetId the id of the asset to search
- * @returns the path to the downloaded asset
- */
-async function findAssetFile(assetId: string): Promise<string | null> {
- const files = await fs.promises.readdir(TMP_FOLDER);
- for (const file of files) {
- if (file.startsWith(assetId)) {
- return path.join(TMP_FOLDER, file);
- }
- }
- return null;
-}
+import fs from "fs";
+import * as os from "os";
+import path from "path";
+import { execa } from "execa";
+import { workerStatsCounter } from "metrics";
+import { getProxyAgent, validateUrl } from "network";
+import { withWorkerTracing } from "workerTracing";
+
+import { db } from "@karakeep/db";
+import { AssetTypes } from "@karakeep/db/schema";
+import {
+ QuotaService,
+ StorageQuotaError,
+ VideoWorkerQueue,
+ ZVideoRequest,
+ zvideoRequestSchema,
+} from "@karakeep/shared-server";
+import {
+ ASSET_TYPES,
+ newAssetId,
+ saveAssetFromFile,
+ silentDeleteAsset,
+} from "@karakeep/shared/assetdb";
+import serverConfig from "@karakeep/shared/config";
+import logger from "@karakeep/shared/logger";
+import { DequeuedJob, getQueueClient } from "@karakeep/shared/queueing";
+
+import { getBookmarkDetails, updateAsset } from "../workerUtils";
+
+const TMP_FOLDER = path.join(os.tmpdir(), "video_downloads");
+
+export class VideoWorker {
+ static async build() {
+ logger.info("Starting video worker ...");
+
+ return (await getQueueClient())!.createRunner<ZVideoRequest>(
+ VideoWorkerQueue,
+ {
+ run: withWorkerTracing("videoWorker.run", runWorker),
+ onComplete: async (job) => {
+ workerStatsCounter.labels("video", "completed").inc();
+ const jobId = job.id;
+ logger.info(
+ `[VideoCrawler][${jobId}] Video Download Completed successfully`,
+ );
+ return Promise.resolve();
+ },
+ onError: async (job) => {
+ workerStatsCounter.labels("video", "failed").inc();
+ if (job.numRetriesLeft == 0) {
+ workerStatsCounter.labels("video", "failed_permanent").inc();
+ }
+ const jobId = job.id;
+ logger.error(
+ `[VideoCrawler][${jobId}] Video Download job failed: ${job.error}`,
+ );
+ return Promise.resolve();
+ },
+ },
+ {
+ pollIntervalMs: 1000,
+ timeoutSecs: serverConfig.crawler.downloadVideoTimeout,
+ concurrency: 1,
+ validator: zvideoRequestSchema,
+ },
+ );
+ }
+}
+
+function prepareYtDlpArguments(
+ url: string,
+ proxy: string | undefined,
+ assetPath: string,
+) {
+ const ytDlpArguments = [url];
+ if (serverConfig.crawler.maxVideoDownloadSize > 0) {
+ ytDlpArguments.push(
+ "-f",
+ `best[filesize<${serverConfig.crawler.maxVideoDownloadSize}M]`,
+ );
+ }
+
+ ytDlpArguments.push(...serverConfig.crawler.ytDlpArguments);
+ ytDlpArguments.push("-o", assetPath);
+ ytDlpArguments.push("--no-playlist");
+ if (proxy) {
+ ytDlpArguments.push("--proxy", proxy);
+ }
+ return ytDlpArguments;
+}
+
+async function runWorker(job: DequeuedJob<ZVideoRequest>) {
+ const jobId = job.id;
+ const { bookmarkId } = job.data;
+
+ const {
+ url,
+ userId,
+ videoAssetId: oldVideoAssetId,
+ } = await getBookmarkDetails(bookmarkId);
+
+ if (!serverConfig.crawler.downloadVideo) {
+ logger.info(
+ `[VideoCrawler][${jobId}] Skipping video download from "${url}", because it is disabled in the config.`,
+ );
+ return;
+ }
+
+ const proxy = getProxyAgent(url);
+ const validation = await validateUrl(url, !!proxy);
+ if (!validation.ok) {
+ logger.warn(
+ `[VideoCrawler][${jobId}] Skipping video download to disallowed URL "${url}": ${validation.reason}`,
+ );
+ return;
+ }
+ const normalizedUrl = validation.url.toString();
+
+ const videoAssetId = newAssetId();
+ let assetPath = `${TMP_FOLDER}/${videoAssetId}`;
+ await fs.promises.mkdir(TMP_FOLDER, { recursive: true });
+
+ const ytDlpArguments = prepareYtDlpArguments(
+ normalizedUrl,
+ proxy?.proxy.toString(),
+ assetPath,
+ );
+
+ try {
+ logger.info(
+ `[VideoCrawler][${jobId}] Attempting to download a file from "${normalizedUrl}" to "${assetPath}" using the following arguments: "${ytDlpArguments}"`,
+ );
+
+ await execa("yt-dlp", ytDlpArguments, {
+ cancelSignal: job.abortSignal,
+ });
+ const downloadPath = await findAssetFile(videoAssetId);
+ if (!downloadPath) {
+ logger.info(
+ "[VideoCrawler][${jobId}] yt-dlp didn't download anything. Skipping ...",
+ );
+ return;
+ }
+ assetPath = downloadPath;
+ } catch (e) {
+ const err = e as Error;
+ if (
+ err.message.includes("ERROR: Unsupported URL:") ||
+ err.message.includes("No media found")
+ ) {
+ logger.info(
+ `[VideoCrawler][${jobId}] Skipping video download from "${normalizedUrl}", because it's not one of the supported yt-dlp URLs`,
+ );
+ return;
+ }
+ const genericError = `[VideoCrawler][${jobId}] Failed to download a file from "${normalizedUrl}" to "${assetPath}"`;
+ if ("stderr" in err) {
+ logger.error(`${genericError}: ${err.stderr}`);
+ } else {
+ logger.error(genericError);
+ }
+ await deleteLeftOverAssetFile(jobId, videoAssetId);
+ return;
+ }
+
+ logger.info(
+ `[VideoCrawler][${jobId}] Finished downloading a file from "${normalizedUrl}" to "${assetPath}"`,
+ );
+
+ // Get file size and check quota before saving
+ const stats = await fs.promises.stat(assetPath);
+ const fileSize = stats.size;
+
+ try {
+ const quotaApproved = await QuotaService.checkStorageQuota(
+ db,
+ userId,
+ fileSize,
+ );
+
+ await saveAssetFromFile({
+ userId,
+ assetId: videoAssetId,
+ assetPath,
+ metadata: { contentType: ASSET_TYPES.VIDEO_MP4 },
+ quotaApproved,
+ });
+
+ await db.transaction(async (txn) => {
+ await updateAsset(
+ oldVideoAssetId,
+ {
+ id: videoAssetId,
+ bookmarkId,
+ userId,
+ assetType: AssetTypes.LINK_VIDEO,
+ contentType: ASSET_TYPES.VIDEO_MP4,
+ size: fileSize,
+ },
+ txn,
+ );
+ });
+ await silentDeleteAsset(userId, oldVideoAssetId);
+
+ logger.info(
+ `[VideoCrawler][${jobId}] Finished downloading video from "${normalizedUrl}" and adding it to the database`,
+ );
+ } catch (error) {
+ if (error instanceof StorageQuotaError) {
+ logger.warn(
+ `[VideoCrawler][${jobId}] Skipping video storage due to quota exceeded: ${error.message}`,
+ );
+ await deleteLeftOverAssetFile(jobId, videoAssetId);
+ return;
+ }
+ throw error;
+ }
+}
+
+/**
+ * Deletes leftover assets in case the download fails
+ *
+ * @param jobId the id of the job
+ * @param assetId the id of the asset to delete
+ */
+async function deleteLeftOverAssetFile(
+ jobId: string,
+ assetId: string,
+): Promise<void> {
+ let assetFile;
+ try {
+ assetFile = await findAssetFile(assetId);
+ } catch {
+ // ignore exception, no asset file was found
+ return;
+ }
+ if (!assetFile) {
+ return;
+ }
+ logger.info(
+ `[VideoCrawler][${jobId}] Deleting leftover video asset "${assetFile}".`,
+ );
+ try {
+ await fs.promises.rm(assetFile);
+ } catch {
+ logger.error(
+ `[VideoCrawler][${jobId}] Failed deleting leftover video asset "${assetFile}".`,
+ );
+ }
+}
+
+/**
+ * yt-dlp automatically adds a file ending to the passed in filename --> we have to search it again in the folder
+ *
+ * @param assetId the id of the asset to search
+ * @returns the path to the downloaded asset
+ */
+async function findAssetFile(assetId: string): Promise<string | null> {
+ const files = await fs.promises.readdir(TMP_FOLDER);
+ for (const file of files) {
+ if (file.startsWith(assetId)) {
+ return path.join(TMP_FOLDER, file);
+ }
+ }
+ return null;
+}
diff --git a/docs/.oxlintrc.json b/docs/.oxlintrc.json
index 2cd470ce..6dd0be34 100644
--- a/docs/.oxlintrc.json
+++ b/docs/.oxlintrc.json
@@ -17,7 +17,7 @@
},
"settings": {
"react": {
- "version": "detect"
+ "version": "19"
}
},
"ignorePatterns": [
diff --git a/docs/package.json b/docs/package.json
index 713e31fa..94035470 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -47,7 +47,6 @@
"last 5 safari version"
]
},
- "prettier": "@karakeep/prettier-config",
"engines": {
"node": ">=18.0"
}
diff --git a/package.json b/package.json
index cf2de668..fef15bac 100644
--- a/package.json
+++ b/package.json
@@ -27,14 +27,12 @@
"husky": "^9.0.11"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@types/node": "^24",
- "oxlint": "^1.29.0",
- "prettier": "^3.4.2",
+ "oxfmt": "^0.35.0",
+ "oxlint": "^1.50.0",
"sherif": "^1.6.1",
"turbo": "^2.5.5"
},
- "prettier": "@karakeep/prettier-config",
"packageManager": "[email protected]",
"pnpm": {
"patchedDependencies": {
diff --git a/packages/api/package.json b/packages/api/package.json
index 676f64b0..a1b12591 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -6,8 +6,8 @@
"type": "module",
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"test": "vitest"
@@ -30,13 +30,11 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@types/bcryptjs": "^2.4.6",
"@types/deep-equal": "^1.0.4",
"@types/rss": "^0.0.32",
"vite-tsconfig-paths": "^4.3.1",
"vitest": "^3.2.4"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/benchmarks/package.json b/packages/benchmarks/package.json
index ce768c43..9dd1817f 100644
--- a/packages/benchmarks/package.json
+++ b/packages/benchmarks/package.json
@@ -8,8 +8,8 @@
"bench": "tsx src/index.ts",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
},
"dependencies": {
@@ -22,11 +22,8 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
- "oxlint": "^1.29.0",
- "prettier": "^3.4.2",
+ "oxlint": "^1.50.0",
"tsx": "^4.8.1"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/db/package.json b/packages/db/package.json
index 80bb19ac..35c61de3 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -10,8 +10,8 @@
"migrate": "tsx migrate.ts",
"generate": "drizzle-kit generate",
"studio": "drizzle-kit studio",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix"
},
@@ -27,11 +27,9 @@
"tsx": "^4.8.1"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@tsconfig/node22": "^22.0.0",
"@types/better-sqlite3": "^7.6.11",
"@vercel/ncc": "^0.38.4"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/e2e_tests/package.json b/packages/e2e_tests/package.json
index d93318aa..a778d3f3 100644
--- a/packages/e2e_tests/package.json
+++ b/packages/e2e_tests/package.json
@@ -6,8 +6,8 @@
"type": "module",
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"test": "vitest run",
@@ -24,12 +24,10 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@types/adm-zip": "^0.5.7",
"adm-zip": "^0.5.16",
"vite-tsconfig-paths": "^4.3.1",
"vitest": "^3.2.4"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/open-api/package.json b/packages/open-api/package.json
index f122b13e..91848d40 100644
--- a/packages/open-api/package.json
+++ b/packages/open-api/package.json
@@ -10,7 +10,6 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"tsx": "^4.8.1"
},
@@ -18,11 +17,10 @@
"typecheck": "tsc --noEmit",
"check": "tsx index.ts check",
"generate": "tsx index.ts",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix"
},
- "main": "index.ts",
- "prettier": "@karakeep/prettier-config"
+ "main": "index.ts"
}
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 5b83cc9a..42d7f37c 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -13,8 +13,8 @@
},
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --ignore-path ../../.prettierignore --write",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"test": "vitest"
@@ -29,10 +29,8 @@
"redis": "^5.11.0"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"vite-tsconfig-paths": "^4.3.1",
"vitest": "^3.2.4"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index d5f52074..5c62313e 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -18,7 +18,6 @@
"types": "./dist/index.d.ts"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@tsconfig/node22": "^22.0.0",
"openapi-typescript": "^7.6.1",
@@ -31,8 +30,8 @@
"run": "tsx src/index.ts",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
},
"repository": {
@@ -40,7 +39,6 @@
"url": "git+https://github.com/karakeep-app/karakeep.git",
"directory": "packages/sdk"
},
- "prettier": "@karakeep/prettier-config",
"dependencies": {
"openapi-fetch": "^0.13.3"
}
diff --git a/packages/shared-react/.oxlintrc.json b/packages/shared-react/.oxlintrc.json
index 3c21fbb0..3c34ad83 100644
--- a/packages/shared-react/.oxlintrc.json
+++ b/packages/shared-react/.oxlintrc.json
@@ -16,7 +16,7 @@
},
"settings": {
"react": {
- "version": "detect"
+ "version": "19"
}
},
"ignorePatterns": [
diff --git a/packages/shared-react/components/ui/button.tsx b/packages/shared-react/components/ui/button.tsx
index 371907d3..e58d9a8b 100644
--- a/packages/shared-react/components/ui/button.tsx
+++ b/packages/shared-react/components/ui/button.tsx
@@ -42,7 +42,8 @@ const buttonVariants = cva(
);
export interface ButtonProps
- extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+ extends
+ React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {
asChild?: boolean;
}
diff --git a/packages/shared-react/package.json b/packages/shared-react/package.json
index 070ed98a..5921d8f7 100644
--- a/packages/shared-react/package.json
+++ b/packages/shared-react/package.json
@@ -19,7 +19,6 @@
"tailwind-merge": "^2.2.1"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0"
},
"peerDependencies": {
@@ -37,10 +36,9 @@
},
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/shared-server/package.json b/packages/shared-server/package.json
index 357248b4..a41169ef 100644
--- a/packages/shared-server/package.json
+++ b/packages/shared-server/package.json
@@ -16,13 +16,12 @@
"@opentelemetry/semantic-conventions": "^1.38.0"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0"
},
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"test": "vitest"
@@ -30,6 +29,5 @@
"main": "index.ts",
"exports": {
".": "./index.ts"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 93739354..12fdcc3b 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -18,7 +18,6 @@
"zod-to-json-schema": "^3.24.3"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@types/html-to-text": "^9.0.4",
"@types/nodemailer": "^6.4.17",
@@ -27,12 +26,11 @@
},
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"test": "vitest"
},
- "main": "index.ts",
- "prettier": "@karakeep/prettier-config"
+ "main": "index.ts"
}
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index 4b52def8..40c37d9d 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -6,8 +6,8 @@
"type": "module",
"scripts": {
"typecheck": "tsc --noEmit",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"test": "vitest"
@@ -29,13 +29,11 @@
"zod": "^3.24.2"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
"@types/bcryptjs": "^2.4.6",
"@types/deep-equal": "^1.0.4",
"@types/nodemailer": "^6.4.17",
"vite-tsconfig-paths": "^4.3.1",
"vitest": "^3.2.4"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/packages/trpc/routers/apiKeys.test.ts b/packages/trpc/routers/apiKeys.test.ts
index d68eaaf1..24866444 100644
--- a/packages/trpc/routers/apiKeys.test.ts
+++ b/packages/trpc/routers/apiKeys.test.ts
@@ -428,9 +428,10 @@ describe("API Keys Routes", () => {
await User.createRaw(db, {
name: "Unverified User",
- password: await (
- await import("../auth")
- ).hashPassword("password123", "test-salt"),
+ password: await (await import("../auth")).hashPassword(
+ "password123",
+ "test-salt",
+ ),
salt: "test-salt",
emailVerified: null, // User is not verified
});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b3e74179..0f9ecb8c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,18 +17,15 @@ importers:
specifier: ^9.0.11
version: 9.1.7
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:tooling/prettier
'@types/node':
specifier: ^24
version: 24.10.3
+ oxfmt:
+ specifier: ^0.35.0
+ version: 0.35.0
oxlint:
- specifier: ^1.29.0
- version: 1.29.0
- prettier:
- specifier: ^3.4.2
- version: 3.4.2
+ specifier: ^1.50.0
+ version: 1.50.0
sherif:
specifier: ^1.6.1
version: 1.6.1
@@ -117,9 +114,6 @@ importers:
'@crxjs/vite-plugin':
specifier: 2.2.0
version: 2.2.0
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tailwind-config':
specifier: workspace:^0.1.0
version: link:../../tooling/tailwind
@@ -159,9 +153,6 @@ importers:
'@commander-js/extra-typings':
specifier: ^12.0.1
version: 12.1.0([email protected])
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/shared':
specifier: workspace:^0.1.0
version: link:../../packages/shared
@@ -238,9 +229,6 @@ importers:
specifier: ^1.0.7
version: 1.0.7([email protected])
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tailwind-config':
specifier: workspace:^0.1.0
version: link:../../tooling/tailwind
@@ -290,9 +278,6 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -492,9 +477,6 @@ importers:
'@babel/core':
specifier: ~7.26.0
version: 7.26.0
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tailwind-config':
specifier: workspace:^0.1.0
version: link:../../tooling/tailwind
@@ -507,9 +489,6 @@ importers:
ajv:
specifier: latest
version: 8.18.0
- prettier:
- specifier: ^3.4.2
- version: 3.4.2
tailwindcss:
specifier: ^3.4.1
version: 3.4.1
@@ -699,9 +678,6 @@ importers:
nuqs:
specifier: ^2.4.3
- prettier:
- specifier: ^3.4.2
- version: 3.4.2
react:
specifier: ^19.2.1
version: 19.2.3
@@ -775,9 +751,6 @@ importers:
specifier: ^5.0.5
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tailwind-config':
specifier: workspace:^0.1.0
version: link:../../tooling/tailwind
@@ -980,9 +953,6 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@types/archiver':
specifier: ^7.0.0
version: 7.0.0
@@ -1096,9 +1066,6 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1142,18 +1109,12 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
oxlint:
- specifier: ^1.29.0
- version: 1.29.0
- prettier:
- specifier: ^3.4.2
- version: 3.4.2
+ specifier: ^1.50.0
+ version: 1.50.0
tsx:
specifier: ^4.8.1
version: 4.20.3
@@ -1188,9 +1149,6 @@ importers:
specifier: ^4.8.1
version: 4.20.3
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1228,9 +1186,6 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1259,9 +1214,6 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1293,9 +1245,6 @@ importers:
specifier: ^5.11.0
version: 5.11.0
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1312,9 +1261,6 @@ importers:
specifier: ^0.13.3
version: 0.13.8
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1370,9 +1316,6 @@ importers:
specifier: ^3.24.3
version: 3.24.5([email protected])
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1437,9 +1380,6 @@ importers:
specifier: ^2.2.1
version: 2.2.1
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1474,9 +1414,6 @@ importers:
specifier: ^1.38.0
version: 1.38.0
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1526,9 +1463,6 @@ importers:
specifier: ^3.24.2
version: 3.24.2
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../../tooling/prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../../tooling/typescript
@@ -1557,9 +1491,6 @@ importers:
'@ianvs/prettier-plugin-sort-imports':
specifier: ^4.1.1
version: 4.4.2([email protected])
- prettier:
- specifier: ^3.4.2
- version: 3.4.2
prettier-plugin-tailwindcss:
specifier: ^0.5.11
@@ -1589,15 +1520,9 @@ importers:
specifier: ^1.0.7
version: 1.0.7([email protected])
devDependencies:
- '@karakeep/prettier-config':
- specifier: workspace:^0.1.0
- version: link:../prettier
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
version: link:../typescript
- prettier:
- specifier: ^3.4.2
- version: 3.4.2
typescript:
specifier: ^5.9
version: 5.9.3
@@ -4509,43 +4434,231 @@ packages:
'@oxc-project/[email protected]':
resolution: {integrity: sha512-+ZFWJF8ZBTOIO5PiNohNIw7JBzJCybScfrhLh65tcHCAtqaQkVDonjRD1HmMV/RF3rtt3r88hzSyTqvXs4j7vw==}
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-XYsieDAI0kXJyvayHnmOW1qVydqklRRVT4O5eZmO/rdNCku5CoXsZvBvkPc3U8/9V1mRuen1sxbM9T5JsZqhdA==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-BaRKlM3DyG81y/xWTsE6gZiv89F/3pHe2BqX2H4JbiB8HNVlWWtplzgATAE5IDSdwChdeuWLDTQzJ92Lglw3ZA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm]
+ os: [android]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-/O+EbuAJYs6nde/anv+aID6uHsGQApyE9JtYBo/79KyU8e6RBN3DMbT0ix97y1SOnCglurmL2iZ+hlohjP2PnQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [android]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-pGqRtqlNdn9d4VrmGUWVyQjkw79ryhI6je9y2jfqNUIZCfqceob+R97YYAoG7C5TFyt8ILdLVoN+L2vw/hSFyA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [darwin]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-s+Ch5/4zDJ6wsOk95xY3BS5mtE2JzHLz7gVZ9OWA9EvhVO84wz2YbDp2JaA314yyqhlX5SAkZ6fj3BRMIcQIqg==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-8GmsDcSozTPjrCJeGpp+sCmS9+9V5yRrdEZ1p/sTWxPG5nYeAfSLuS0nuEYjXSO+CtdSbStIW6dxa+4NM58yRw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [darwin]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-qLCgdUkDBG8muK1o3mPgf31rvCPzj1Xff9DHlJjfv+B0ee/hJ2LAoK8EIsQedfQuuiAccOe9GG65BivGCTgKOg==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-QyfKfTe0ytHpFKHAcHCGQEzN45QSqq1AHJOYYxQMgLM3KY4xu8OsXHpCnINjDsV4XGnQzczJDU9e04Zmd8XqIQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [x64]
+ os: [freebsd]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-u+kv3JD6P3J38oOyUaiCqgY5TNESzBRZJ5lyZQ6c2czUW2v5SIN9E/KWWa9vxoc+P8AFXQFUVrdzGy1tK+nbPQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm]
+ os: [linux]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-1NiZroCiV57I7Pf8kOH4XGR366kW5zir3VfSMBU2D0V14GpYjiYmPYFAoJboZvp8ACnZKUReWyMkNKSa5ad58A==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm]
+ os: [linux]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-7Q0Xeg7ZnW2nxnZ4R7aF6DEbCFls4skgHZg+I63XitpNvJCbVIU8MFOTZlvZGRsY9+rPgWPQGeUpLHlyx0wvMA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-qe62yb1fyW51wo1VBpx9AJJ1Ih1T8NYDeR9AmpNGkrmKN8u3pPbcGXM4mCrOwpwJUG9M/oFvCIlIz2RhawHlkA==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-5Okqi+uhYFxwKz8hcnUftNNwdm8BCkf6GSCbcz9xJxYMm87k1E4p7PEmAAbhLTk7cjSdDre6TDL0pDzNX+Y22Q==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-4x7p2iVoSE2aT9qI1JOLxUAv3UuzMYGBYWBA4ZF8ln99AdUo1eo0snFacPNd6I/ZZNcv5TegXC+0EUhp5MfYBw==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-9k66pbZQXM/lBJWys3Xbc5yhl4JexyfqkEf/tvtq8976VIJnLAAL3M127xHA3ifYSqxdVHfVGTg84eiBHCGcNw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [ppc64]
+ os: [linux]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-aUcY9ofKPtjO52idT6t0SAQvEF6ctjzUQa1lLp7GDsRpSBvuTrBQGeq0rYKz3gN8dMIQ7mtMdGD9tT4LhR8jAQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [riscv64]
+ os: [linux]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-C6yhY5Hvc2sGM+mCPek9ZLe5xRUOC/BvhAt2qIWFAeXMn4il04EYIjl3DsWiJr0xDMTJhvMOmD55xTRPlNp39w==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [riscv64]
+ os: [linux]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-RG2hlvOMK4OMZpO3mt8MpxLQ0AAezlFqhn5mI/g5YrVbPFyoCv9a34AAvbSJS501ocOxlFIRcKEuw5hFvddf9g==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [s390x]
+ os: [linux]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-wzmh90Pwvqj9xOKHJjkQYBpydRkaXG77ZvDz+iFDRRQpnqIEqGm5gmim2s6vnZIkDGsvKCuTdtxm0GFmBjM1+w==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-BdH5gdRpaYpyZn2Zm+MCS4b1YmXNe7QyQhw0fawuou+N1LrdAyELgvqI5xXZ1MXCgWDOa6WJaoE6VOPaDc29GA==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-+HCqYCJPCUy5I+b2cf+gUVaApfgtoQT3HdnSg/l7NIcLHOhKstlYaGyrFZLmUpQt4WkFbpGKZZayG6zjRU0KFA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-y+j9ZDrnMxvRTNIstZKFY7gJD07nT++c4cGmub1ENvhoHVToiQAAZQUOLDhXXRzCrFoG/cFJXJf72uowHZPbcg==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-kFYmWfR9YL78XyO5ws+1dsxNvZoD973qfVMNFOS4e9bcHXGF7DvGC2tY5UDFwyMCeB33t3sDIuGONKggnVNSJA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [openharmony]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-uD/NGdM65eKNCDGyTGdO8e9n3IHX+wwuorBvEYrPJXhDXL9qz6gzddmXH8EN04ejUXUujlq4FsoSeCfbg0Y+Jg==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [win32]
- '@oxlint/[email protected]':
- resolution: {integrity: sha512-F1iRtq8VT96lT8hqOubLyV0GxgIK/XdXk2kFLXdCspiI2ngXeNmTTvmPxrj+WFL6fpJPgv7VKWRb/zEHJnNOrg==}
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-oSRD2k8J2uxYDEKR2nAE/YTY9PobOEnhZgCmspHu0+yBQ665yH8lFErQVSTE7fcGJmJp/cC6322/gc8VFuQf7g==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [ia32]
+ os: [win32]
+
+ '@oxfmt/[email protected]':
+ resolution: {integrity: sha512-WCDJjlS95NboR0ugI2BEwzt1tYvRDorDRM9Lvctls1SLyKYuNRCyrPwp1urUPFBnwgBNn9p2/gnmo7gFMySRoQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [x64]
+ os: [win32]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-G7MRGk/6NCe+L8ntonRdZP7IkBfEpiZ/he3buLK6JkLgMHgJShXZ+BeOwADmspXez7U7F7L1Anf4xLSkLHiGTg==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm]
+ os: [android]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-GeSuMoJWCVpovJi/e3xDSNgjeR8WEZ6MCXL6EtPiCIM2NTzv7LbflARINTXTJy2oFBYyvdf/l2PwHzYo6EdXvg==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [android]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-w3SY5YtxGnxCHPJ8Twl3KmS9oja1gERYk3AMoZ7Hv8P43ZtB6HVfs02TxvarxfL214Tm3uzvc2vn+DhtUNeKnw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-hNfogDqy7tvmllXKBSlHo6k5x7dhTUVOHbMSE15CCAcXzmqf5883aPvBYPOq9AE7DpDUQUZ1kVE22YbiGW+tuw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [x64]
+ os: [darwin]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-ykZevOWEyu0nsxolA911ucxpEv0ahw8jfEeGWOwwb/VPoE4xoexuTOAiPNlWZNJqANlJl7yp8OyzCtXTUAxotw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [x64]
+ os: [freebsd]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-hif3iDk7vo5GGJ4OLCCZAf2vjnU9FztGw4L0MbQL0M2iY9LKFtDMMiQAHmkF0PQGQMVbTYtPdXCLKVgdkiqWXQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-dVp9iSssiGAnTNey2Ruf6xUaQhdnvcFOJyRWd/mu5o2jVbFK15E5fbWGeFRfmuobu5QXuROtFga44+7DOS3PLg==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-1cT7yz2HA910CKA9NkH1ZJo50vTtmND2fkoW1oyiSb0j6WvNtJ0Wx2zoySfXWc/c+7HFoqRK5AbEoL41LOn9oA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-++B3k/HEPFVlj89cOz8kWfQccMZB/aWL9AhsW7jPIkG++63Mpwb2cE9XOEsd0PATbIan78k2Gky+09uWM1d/gQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-Z9b/KpFMkx66w3gVBqjIC1AJBTZAGoI9+U+K5L4QM0CB/G0JSNC1es9b3Y0Vcrlvtdn8A+IQTkYjd/Q0uCSaZw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [ppc64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-jvmuIw8wRSohsQlFNIST5uUwkEtEJmOQYr33bf/K2FrFPXHhM4KqGekI3ShYJemFS/gARVacQFgBzzJKCAyJjg==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [riscv64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-x+UrN47oYNh90nmAAyql8eQaaRpHbDPu5guasDg10+OpszUQ3/1+1J6zFMmV4xfIEgTcUXG/oI5fxJhF4eWCNA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [riscv64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-i/JLi2ljLUIVfekMj4ISmdt+Hn11wzYUdRRrkVUYsCWw7zAy5xV7X9iA+KMyM156LTFympa7s3oKBjuCLoTAUQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [s390x]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-/C7brhn6c6UUPccgSPCcpLQXcp+xKIW/3sji/5VZ8/OItL3tQ2U7KalHz887UxxSQeEOmd1kY6lrpuwFnmNqOA==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [x64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-oDR1f+bGOYU8LfgtEW8XtotWGB63ghtcxk5Jm6IDTCk++rTA/IRMsjOid2iMd+1bW+nP9Mdsmcdc7VbPD3+iyQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [x64]
+ os: [linux]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-4CmRGPp5UpvXyu4jjP9Tey/SrXDQLRvZXm4pb4vdZBxAzbFZkCyh0KyRy4txld/kZKTJlW4TO8N1JKrNEk+mWw==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [openharmony]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-Fq0M6vsGcFsSfeuWAACDhd5KJrO85ckbEfe1EGuBj+KPyJz7KeWte2fSFrFGmNKNXyhEMyx4tbgxiWRujBM2KQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [arm64]
+ os: [win32]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-qTdWR9KwY/vxJGhHVIZG2eBOhidOQvOwzDxnX+jhW/zIVacal1nAhR8GLkiywW8BIFDkQKXo/zOfT+/DY+ns/w==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ cpu: [ia32]
+ os: [win32]
+
+ '@oxlint/[email protected]':
+ resolution: {integrity: sha512-682t7npLC4G2Ca+iNlI9fhAKTcFPYYXJjwoa88H4q+u5HHHlsnL/gHULapX3iqp+A8FIJbgdylL5KMYo2LaluQ==}
+ engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [win32]
@@ -11968,12 +12081,17 @@ packages:
resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
engines: {node: '>= 0.4'}
- resolution: {integrity: sha512-YqUVUhTYDqazV2qu3QSQn/H4Z1OP+fTnedgZWDk1/lDZxGfR0b1MqRVaEm3rRjBMLHP0zXlriIWUx+DD6UMaPA==}
+ resolution: {integrity: sha512-QYeXWkP+aLt7utt5SLivNIk09glWx9QE235ODjgcEZ3sd1VMaUBSpLymh6ZRCA76gD2rMP4bXanUz/fx+nLM9Q==}
+ engines: {node: ^20.19.0 || >=22.12.0}
+ hasBin: true
+
+ resolution: {integrity: sha512-iSJ4IZEICBma8cZX7kxIIz9PzsYLF2FaLAYN6RKu7VwRVKdu7RIgpP99bTZaGl//Yao7fsaGZLSEo5xBrI5ReQ==}
engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true
peerDependencies:
- oxlint-tsgolint: '>=0.7.1'
+ oxlint-tsgolint: '>=0.14.1'
peerDependenciesMeta:
oxlint-tsgolint:
optional: true
@@ -14679,6 +14797,10 @@ packages:
resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
engines: {node: ^18.0.0 || >=20.0.0}
+ resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==}
+ engines: {node: ^20.0.0 || >=22.0.0}
+
resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
engines: {node: '>=14.0.0'}
@@ -20441,28 +20563,118 @@ snapshots:
'@oxc-project/[email protected]': {}
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
optional: true
- '@oxlint/[email protected]':
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxfmt/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
+ optional: true
+
+ '@oxlint/[email protected]':
optional: true
'@panva/[email protected]': {}
@@ -29462,16 +29674,51 @@ snapshots:
object-keys: 1.1.1
safe-push-apply: 1.0.0
+ dependencies:
+ tinypool: 2.1.0
+ optionalDependencies:
+ '@oxfmt/binding-android-arm-eabi': 0.35.0
+ '@oxfmt/binding-android-arm64': 0.35.0
+ '@oxfmt/binding-darwin-arm64': 0.35.0
+ '@oxfmt/binding-darwin-x64': 0.35.0
+ '@oxfmt/binding-freebsd-x64': 0.35.0
+ '@oxfmt/binding-linux-arm-gnueabihf': 0.35.0
+ '@oxfmt/binding-linux-arm-musleabihf': 0.35.0
+ '@oxfmt/binding-linux-arm64-gnu': 0.35.0
+ '@oxfmt/binding-linux-arm64-musl': 0.35.0
+ '@oxfmt/binding-linux-ppc64-gnu': 0.35.0
+ '@oxfmt/binding-linux-riscv64-gnu': 0.35.0
+ '@oxfmt/binding-linux-riscv64-musl': 0.35.0
+ '@oxfmt/binding-linux-s390x-gnu': 0.35.0
+ '@oxfmt/binding-linux-x64-gnu': 0.35.0
+ '@oxfmt/binding-linux-x64-musl': 0.35.0
+ '@oxfmt/binding-openharmony-arm64': 0.35.0
+ '@oxfmt/binding-win32-arm64-msvc': 0.35.0
+ '@oxfmt/binding-win32-ia32-msvc': 0.35.0
+ '@oxfmt/binding-win32-x64-msvc': 0.35.0
+
optionalDependencies:
- '@oxlint/darwin-arm64': 1.29.0
- '@oxlint/darwin-x64': 1.29.0
- '@oxlint/linux-arm64-gnu': 1.29.0
- '@oxlint/linux-arm64-musl': 1.29.0
- '@oxlint/linux-x64-gnu': 1.29.0
- '@oxlint/linux-x64-musl': 1.29.0
- '@oxlint/win32-arm64': 1.29.0
- '@oxlint/win32-x64': 1.29.0
+ '@oxlint/binding-android-arm-eabi': 1.50.0
+ '@oxlint/binding-android-arm64': 1.50.0
+ '@oxlint/binding-darwin-arm64': 1.50.0
+ '@oxlint/binding-darwin-x64': 1.50.0
+ '@oxlint/binding-freebsd-x64': 1.50.0
+ '@oxlint/binding-linux-arm-gnueabihf': 1.50.0
+ '@oxlint/binding-linux-arm-musleabihf': 1.50.0
+ '@oxlint/binding-linux-arm64-gnu': 1.50.0
+ '@oxlint/binding-linux-arm64-musl': 1.50.0
+ '@oxlint/binding-linux-ppc64-gnu': 1.50.0
+ '@oxlint/binding-linux-riscv64-gnu': 1.50.0
+ '@oxlint/binding-linux-riscv64-musl': 1.50.0
+ '@oxlint/binding-linux-s390x-gnu': 1.50.0
+ '@oxlint/binding-linux-x64-gnu': 1.50.0
+ '@oxlint/binding-linux-x64-musl': 1.50.0
+ '@oxlint/binding-openharmony-arm64': 1.50.0
+ '@oxlint/binding-win32-arm64-msvc': 1.50.0
+ '@oxlint/binding-win32-ia32-msvc': 1.50.0
+ '@oxlint/binding-win32-x64-msvc': 1.50.0
@@ -32718,6 +32965,8 @@ snapshots:
+
diff --git a/tooling/prettier/package.json b/tooling/prettier/package.json
index 3a364195..eddbdf98 100644
--- a/tooling/prettier/package.json
+++ b/tooling/prettier/package.json
@@ -8,18 +8,16 @@
},
"scripts": {
"clean": "rm -rf .turbo node_modules",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@ianvs/prettier-plugin-sort-imports": "^4.1.1",
- "prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.5.11"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
"typescript": "^5.9"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/tooling/tailwind/package.json b/tooling/tailwind/package.json
index 43f8c141..37a6e9bf 100644
--- a/tooling/tailwind/package.json
+++ b/tooling/tailwind/package.json
@@ -11,8 +11,8 @@
"license": "MIT",
"scripts": {
"clean": "rm -rf .turbo node_modules",
- "format": "prettier . --cache --ignore-path ../../.prettierignore --check",
- "format:fix": "prettier . --cache --write --ignore-path ../../.prettierignore",
+ "format": "oxfmt --check .",
+ "format:fix": "oxfmt .",
"lint": "oxlint .",
"lint:fix": "oxlint . --fix",
"typecheck": "tsc --noEmit"
@@ -25,10 +25,7 @@
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
- "@karakeep/prettier-config": "workspace:^0.1.0",
"@karakeep/tsconfig": "workspace:^0.1.0",
- "prettier": "^3.4.2",
"typescript": "^5.9"
- },
- "prettier": "@karakeep/prettier-config"
+ }
}
diff --git a/turbo.json b/turbo.json
index d2022436..e5f37e13 100644
--- a/turbo.json
+++ b/turbo.json
@@ -28,15 +28,9 @@
"cache": false
},
"format": {
- "outputs": [
- "node_modules/.cache/prettier/.prettier-cache"
- ],
"outputLogs": "new-only"
},
"format:fix": {
- "outputs": [
- "node_modules/.cache/prettier/.prettier-cache"
- ],
"outputLogs": "new-only"
},
"lint": {