diff options
| author | MohamedBassem <me@mbassem.com> | 2025-04-12 19:37:18 +0100 |
|---|---|---|
| committer | MohamedBassem <me@mbassem.com> | 2025-04-12 19:37:40 +0100 |
| commit | 755fc36e912964863d4f46bb32adda6332b419fe (patch) | |
| tree | 3c54e9e6ed7686a119804716ccb6fdd6ad0da3c3 | |
| parent | 7f569042f153a55189fb28e6ef6ab127b8190afd (diff) | |
| download | karakeep-755fc36e912964863d4f46bb32adda6332b419fe.tar.zst | |
chore: Rename hoarder packages to karakeep
230 files changed, 654 insertions, 644 deletions
diff --git a/SECURITY.md b/SECURITY.md index e88307d5..291bc42f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,4 +2,4 @@ ## Reporting a Vulnerability -Please report security issues to `security@hoarder.app` +Please report security issues to `security@karakeep.app` diff --git a/apps/browser-extension/package.json b/apps/browser-extension/package.json index ab7e4e24..58da5217 100644 --- a/apps/browser-extension/package.json +++ b/apps/browser-extension/package.json @@ -14,9 +14,9 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/shared-react": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", + "@karakeep/shared-react": "workspace:^0.1.0", + "@karakeep/trpc": "workspace:^0.1.0", "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-popover": "^1.0.7", "@radix-ui/react-select": "^2.0.0", @@ -41,10 +41,10 @@ }, "devDependencies": { "@crxjs/vite-plugin": "2.0.0-beta.28", - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tailwind-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.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", "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", @@ -61,9 +61,9 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/react" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/apps/browser-extension/src/BookmarkSavedPage.tsx b/apps/browser-extension/src/BookmarkSavedPage.tsx index 2c594ad8..380ba4d2 100644 --- a/apps/browser-extension/src/BookmarkSavedPage.tsx +++ b/apps/browser-extension/src/BookmarkSavedPage.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { ArrowUpRightFromSquare, Trash } from "lucide-react"; import { Link, useNavigate, useParams } from "react-router-dom"; -import { useDeleteBookmark } from "@hoarder/shared-react/hooks/bookmarks"; +import { useDeleteBookmark } from "@karakeep/shared-react/hooks/bookmarks"; import BookmarkLists from "./components/BookmarkLists"; import { ListsSelector } from "./components/ListsSelector"; diff --git a/apps/browser-extension/src/SavePage.tsx b/apps/browser-extension/src/SavePage.tsx index 06530f9d..52c9c687 100644 --- a/apps/browser-extension/src/SavePage.tsx +++ b/apps/browser-extension/src/SavePage.tsx @@ -5,7 +5,7 @@ import { BookmarkTypes, ZNewBookmarkRequest, zNewBookmarkRequestSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { NEW_BOOKMARK_REQUEST_KEY_NAME } from "./background/protocol"; import Spinner from "./Spinner"; diff --git a/apps/browser-extension/src/background/background.ts b/apps/browser-extension/src/background/background.ts index 102566f7..98d2ef36 100644 --- a/apps/browser-extension/src/background/background.ts +++ b/apps/browser-extension/src/background/background.ts @@ -1,7 +1,7 @@ import {
BookmarkTypes,
ZNewBookmarkRequest,
-} from "@hoarder/shared/types/bookmarks.ts";
+} from "@karakeep/shared/types/bookmarks.ts";
import {
getPluginSettings,
diff --git a/apps/browser-extension/src/components/BookmarkLists.tsx b/apps/browser-extension/src/components/BookmarkLists.tsx index 9ccd8951..1d70d257 100644 --- a/apps/browser-extension/src/components/BookmarkLists.tsx +++ b/apps/browser-extension/src/components/BookmarkLists.tsx @@ -3,7 +3,7 @@ import { X } from "lucide-react"; import { useBookmarkLists, useRemoveBookmarkFromList, -} from "@hoarder/shared-react/hooks/lists"; +} from "@karakeep/shared-react/hooks/lists"; import { api } from "../utils/trpc"; import { Button } from "./ui/button"; diff --git a/apps/browser-extension/src/components/ListsSelector.tsx b/apps/browser-extension/src/components/ListsSelector.tsx index a5fdc198..8f74098f 100644 --- a/apps/browser-extension/src/components/ListsSelector.tsx +++ b/apps/browser-extension/src/components/ListsSelector.tsx @@ -6,7 +6,7 @@ import { useAddBookmarkToList, useBookmarkLists, useRemoveBookmarkFromList, -} from "@hoarder/shared-react/hooks/lists"; +} from "@karakeep/shared-react/hooks/lists"; import { cn } from "../utils/css"; import { api } from "../utils/trpc"; diff --git a/apps/browser-extension/src/components/TagList.tsx b/apps/browser-extension/src/components/TagList.tsx index 96b8501e..2d77f17f 100644 --- a/apps/browser-extension/src/components/TagList.tsx +++ b/apps/browser-extension/src/components/TagList.tsx @@ -1,5 +1,5 @@ -import { useAutoRefreshingBookmarkQuery } from "@hoarder/shared-react/hooks/bookmarks"; -import { isBookmarkStillTagging } from "@hoarder/shared-react/utils/bookmarkUtils"; +import { useAutoRefreshingBookmarkQuery } from "@karakeep/shared-react/hooks/bookmarks"; +import { isBookmarkStillTagging } from "@karakeep/shared-react/utils/bookmarkUtils"; import { Badge } from "./ui/badge"; diff --git a/apps/browser-extension/src/components/TagsSelector.tsx b/apps/browser-extension/src/components/TagsSelector.tsx index ab92420c..9df1d582 100644 --- a/apps/browser-extension/src/components/TagsSelector.tsx +++ b/apps/browser-extension/src/components/TagsSelector.tsx @@ -5,7 +5,7 @@ import { Check, ChevronsUpDown, Plus } from "lucide-react"; import { useAutoRefreshingBookmarkQuery, useUpdateBookmarkTags, -} from "@hoarder/shared-react/hooks/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; import { cn } from "../utils/css"; import { api } from "../utils/trpc"; diff --git a/apps/browser-extension/src/index.css b/apps/browser-extension/src/index.css index d5c92220..7e13f94e 100644 --- a/apps/browser-extension/src/index.css +++ b/apps/browser-extension/src/index.css @@ -1 +1 @@ -@import "@hoarder/tailwind-config/globals.css"; +@import "@karakeep/tailwind-config/globals.css"; diff --git a/apps/browser-extension/src/utils/providers.tsx b/apps/browser-extension/src/utils/providers.tsx index 4b571254..827cc84e 100644 --- a/apps/browser-extension/src/utils/providers.tsx +++ b/apps/browser-extension/src/utils/providers.tsx @@ -1,4 +1,4 @@ -import { TRPCProvider } from "@hoarder/shared-react/providers/trpc-provider"; +import { TRPCProvider } from "@karakeep/shared-react/providers/trpc-provider"; import usePluginSettings from "./settings"; import { ThemeProvider } from "./ThemeProvider"; diff --git a/apps/browser-extension/src/utils/trpc.ts b/apps/browser-extension/src/utils/trpc.ts index 9b025df1..e56968b8 100644 --- a/apps/browser-extension/src/utils/trpc.ts +++ b/apps/browser-extension/src/utils/trpc.ts @@ -1,5 +1,5 @@ import { createTRPCReact } from "@trpc/react-query"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export const api = createTRPCReact<AppRouter>(); diff --git a/apps/browser-extension/tailwind.config.js b/apps/browser-extension/tailwind.config.js index 7300649a..d378ba15 100644 --- a/apps/browser-extension/tailwind.config.js +++ b/apps/browser-extension/tailwind.config.js @@ -1,4 +1,4 @@ -import web from "@hoarder/tailwind-config/web"; +import web from "@karakeep/tailwind-config/web"; const config = { darkMode: "media", diff --git a/apps/cli/package.json b/apps/cli/package.json index cd17bb14..7c504847 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -1,24 +1,25 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarderapp/cli", - "version": "0.20.0", - "description": "Command Line Interface (CLI) for Hoarder", + "name": "@karakeep/cli", + "version": "0.23.0", + "description": "Command Line Interface (CLI) for Karakeep", "license": "GNU Affero General Public License version 3", "keywords": [ "hoarder", + "karakeep", "cli" ], "exports": "./dist/index.mjs", "bin": { - "hoarder": "dist/index.mjs" + "karakeep": "dist/index.mjs" }, "devDependencies": { "@commander-js/extra-typings": "^12.0.1", - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@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", "@trpc/client": "11.0.0", "@trpc/server": "11.0.0", "@tsconfig/node22": "^22.0.0", @@ -40,14 +41,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/hoarder-app/hoarder.git", + "url": "git+https://github.com/karakeep-app/karakeep.git", "directory": "apps/cli" }, "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/apps/cli/src/commands/bookmarks.ts b/apps/cli/src/commands/bookmarks.ts index b6f7b2d3..130ad376 100644 --- a/apps/cli/src/commands/bookmarks.ts +++ b/apps/cli/src/commands/bookmarks.ts @@ -9,11 +9,11 @@ import { import { getAPIClient } from "@/lib/trpc"; import { Command } from "@commander-js/extra-typings"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import { BookmarkTypes, MAX_NUM_BOOKMARKS_PER_PAGE, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; export const bookmarkCmd = new Command() .name("bookmarks") diff --git a/apps/cli/src/commands/lists.ts b/apps/cli/src/commands/lists.ts index 57b6d948..864fa790 100644 --- a/apps/cli/src/commands/lists.ts +++ b/apps/cli/src/commands/lists.ts @@ -9,7 +9,7 @@ import { getAPIClient } from "@/lib/trpc"; import { Command } from "@commander-js/extra-typings"; import { getBorderCharacters, table } from "table"; -import { listsToTree } from "@hoarder/shared/utils/listUtils"; +import { listsToTree } from "@karakeep/shared/utils/listUtils"; export const listsCmd = new Command() .name("lists") diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts index a2a21a75..7d6c1472 100644 --- a/apps/cli/src/index.ts +++ b/apps/cli/src/index.ts @@ -7,12 +7,12 @@ import { setGlobalOptions } from "@/lib/globals"; import { Command, Option } from "@commander-js/extra-typings"; const program = new Command() - .name("hoarder") - .description("A CLI interface to interact with the hoarder api") + .name("karakeep") + .description("A CLI interface to interact with the karakeep api") .addOption( new Option("--api-key <key>", "the API key to interact with the API") .makeOptionMandatory(true) - .env("HOARDER_API_KEY"), + .env("KARAKEEP_API_KEY"), ) .addOption( new Option( @@ -20,7 +20,7 @@ const program = new Command() "the address of the server to connect to", ) .makeOptionMandatory(true) - .env("HOARDER_SERVER_ADDR"), + .env("KARAKEEP_SERVER_ADDR"), ) .addOption(new Option("--json", "to output the result as JSON")) .version( diff --git a/apps/cli/src/lib/trpc.ts b/apps/cli/src/lib/trpc.ts index 27082b10..e6c5555d 100644 --- a/apps/cli/src/lib/trpc.ts +++ b/apps/cli/src/lib/trpc.ts @@ -2,7 +2,7 @@ import { getGlobalOptions } from "@/lib/globals"; import { createTRPCClient, httpBatchLink } from "@trpc/client"; import superjson from "superjson"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export function getAPIClient() { const globals = getGlobalOptions(); diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json index bf344404..07b074a3 100644 --- a/apps/cli/tsconfig.json +++ b/apps/cli/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["src", "vite.config.mts"], "exclude": ["node_modules", "dist"], "compilerOptions": { diff --git a/apps/landing/package.json b/apps/landing/package.json index 73971f0e..4d231443 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/landing", + "name": "@karakeep/landing", "version": "0.1.0", "private": true, "type": "module", @@ -28,10 +28,10 @@ "tailwindcss-animate": "^1.0.7" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tailwind-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@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", "@types/react": "^18.2.55", "@types/react-dom": "^18.2.19", @@ -45,9 +45,9 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/react" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/apps/landing/src/App.tsx b/apps/landing/src/App.tsx index 06a1e5b8..ddf92e32 100644 --- a/apps/landing/src/App.tsx +++ b/apps/landing/src/App.tsx @@ -1,7 +1,7 @@ import Homepage from "@/src/Homepage"; import Privacy from "@/src/Privacy"; -import "@hoarder/tailwind-config/globals.css"; +import "@karakeep/tailwind-config/globals.css"; export default function App() { // Poor man router diff --git a/apps/landing/tailwind.config.ts b/apps/landing/tailwind.config.ts index 1c042f0e..44bb114c 100644 --- a/apps/landing/tailwind.config.ts +++ b/apps/landing/tailwind.config.ts @@ -1,6 +1,6 @@ import type { Config } from "tailwindcss"; -import web from "@hoarder/tailwind-config/web"; +import web from "@karakeep/tailwind-config/web"; const config = { content: web.content, diff --git a/apps/landing/tsconfig.json b/apps/landing/tsconfig.json index 71752aad..0fb0017a 100644 --- a/apps/landing/tsconfig.json +++ b/apps/landing/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "baseUrl": ".", "paths": { diff --git a/apps/mobile/app/dashboard/(tabs)/lists.tsx b/apps/mobile/app/dashboard/(tabs)/lists.tsx index 0dae3ea7..218c1de4 100644 --- a/apps/mobile/app/dashboard/(tabs)/lists.tsx +++ b/apps/mobile/app/dashboard/(tabs)/lists.tsx @@ -11,8 +11,8 @@ import { api } from "@/lib/trpc"; import { condProps } from "@/lib/utils"; import { ChevronRight, Plus } from "lucide-react-native"; -import { useBookmarkLists } from "@hoarder/shared-react/hooks/lists"; -import { ZBookmarkListTreeNode } from "@hoarder/shared/utils/listUtils"; +import { useBookmarkLists } from "@karakeep/shared-react/hooks/lists"; +import { ZBookmarkListTreeNode } from "@karakeep/shared/utils/listUtils"; function HeaderRight({ openNewListModal }: { openNewListModal: () => void }) { return ( diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx index e89d572d..7edbd0b8 100644 --- a/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx +++ b/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx @@ -26,8 +26,8 @@ import { ClipboardList, Globe, Info, Tag, Trash2 } from "lucide-react-native"; import { useDeleteBookmark, useUpdateBookmark, -} from "@hoarder/shared-react/hooks/bookmarks"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; function BottomActions({ bookmark }: { bookmark: ZBookmark }) { const { toast } = useToast(); diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx index 906ebdc7..ebd3a1e2 100644 --- a/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx +++ b/apps/mobile/app/dashboard/bookmarks/[slug]/info.tsx @@ -21,9 +21,9 @@ import { ChevronRight } from "lucide-react-native"; import { useAutoRefreshingBookmarkQuery, useUpdateBookmark, -} from "@hoarder/shared-react/hooks/bookmarks"; -import { isBookmarkStillTagging } from "@hoarder/shared-react/utils/bookmarkUtils"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; +import { isBookmarkStillTagging } from "@karakeep/shared-react/utils/bookmarkUtils"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; function TagList({ bookmark }: { bookmark: ZBookmark }) { return ( diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/manage_lists.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/manage_lists.tsx index b38261df..9f2149ae 100644 --- a/apps/mobile/app/dashboard/bookmarks/[slug]/manage_lists.tsx +++ b/apps/mobile/app/dashboard/bookmarks/[slug]/manage_lists.tsx @@ -9,8 +9,8 @@ import { useAddBookmarkToList, useBookmarkLists, useRemoveBookmarkFromList, -} from "@hoarder/shared-react/hooks/lists"; -import { api } from "@hoarder/shared-react/trpc"; +} from "@karakeep/shared-react/hooks/lists"; +import { api } from "@karakeep/shared-react/trpc"; const ListPickerPage = () => { const { slug: bookmarkId } = useLocalSearchParams(); diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx index 1b5c53e5..d464b06b 100644 --- a/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx +++ b/apps/mobile/app/dashboard/bookmarks/[slug]/manage_tags.tsx @@ -10,8 +10,8 @@ import { Check, Plus } from "lucide-react-native"; import { useAutoRefreshingBookmarkQuery, useUpdateBookmarkTags, -} from "@hoarder/shared-react/hooks/bookmarks"; -import { api } from "@hoarder/shared-react/trpc"; +} from "@karakeep/shared-react/hooks/bookmarks"; +import { api } from "@karakeep/shared-react/trpc"; const NEW_TAG_ID = "new-tag"; diff --git a/apps/mobile/app/dashboard/bookmarks/new.tsx b/apps/mobile/app/dashboard/bookmarks/new.tsx index 06a16a40..e821555a 100644 --- a/apps/mobile/app/dashboard/bookmarks/new.tsx +++ b/apps/mobile/app/dashboard/bookmarks/new.tsx @@ -6,8 +6,8 @@ import CustomSafeAreaView from "@/components/ui/CustomSafeAreaView"; import { Input } from "@/components/ui/Input"; import { useToast } from "@/components/ui/Toast"; -import { useCreateBookmark } from "@hoarder/shared-react/hooks/bookmarks"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { useCreateBookmark } from "@karakeep/shared-react/hooks/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; const NoteEditorPage = () => { const dismiss = () => { diff --git a/apps/mobile/app/dashboard/lists/new.tsx b/apps/mobile/app/dashboard/lists/new.tsx index 998638aa..2cd690f5 100644 --- a/apps/mobile/app/dashboard/lists/new.tsx +++ b/apps/mobile/app/dashboard/lists/new.tsx @@ -6,7 +6,7 @@ import CustomSafeAreaView from "@/components/ui/CustomSafeAreaView"; import { Input } from "@/components/ui/Input"; import { useToast } from "@/components/ui/Toast"; -import { useCreateBookmarkList } from "@hoarder/shared-react/hooks/lists"; +import { useCreateBookmarkList } from "@karakeep/shared-react/hooks/lists"; const NewListPage = () => { const dismiss = () => { diff --git a/apps/mobile/app/sharing.tsx b/apps/mobile/app/sharing.tsx index 55c2da9d..941b4c83 100644 --- a/apps/mobile/app/sharing.tsx +++ b/apps/mobile/app/sharing.tsx @@ -8,7 +8,7 @@ import { api } from "@/lib/trpc"; import { useUploadAsset } from "@/lib/upload"; import { z } from "zod"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; type Mode = | { type: "idle" } diff --git a/apps/mobile/components/bookmarks/BookmarkCard.tsx b/apps/mobile/components/bookmarks/BookmarkCard.tsx index 3cbd064e..21ca1635 100644 --- a/apps/mobile/components/bookmarks/BookmarkCard.tsx +++ b/apps/mobile/components/bookmarks/BookmarkCard.tsx @@ -16,17 +16,17 @@ import { api } from "@/lib/trpc"; import { MenuView } from "@react-native-menu/menu"; import { Ellipsis, Star } from "lucide-react-native"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import { useDeleteBookmark, useUpdateBookmark, -} from "@hoarder/shared-react/hooks/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; import { getBookmarkLinkImageUrl, isBookmarkStillLoading, isBookmarkStillTagging, -} from "@hoarder/shared-react/utils/bookmarkUtils"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/utils/bookmarkUtils"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import { Divider } from "../ui/Divider"; import { Skeleton } from "../ui/Skeleton"; diff --git a/apps/mobile/components/bookmarks/BookmarkList.tsx b/apps/mobile/components/bookmarks/BookmarkList.tsx index 6eabe4d4..7be63ed6 100644 --- a/apps/mobile/components/bookmarks/BookmarkList.tsx +++ b/apps/mobile/components/bookmarks/BookmarkList.tsx @@ -3,7 +3,7 @@ import { ActivityIndicator, Keyboard, Text, View } from "react-native"; import Animated, { LinearTransition } from "react-native-reanimated"; import { useScrollToTop } from "@react-navigation/native"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import BookmarkCard from "./BookmarkCard"; diff --git a/apps/mobile/components/bookmarks/TagPill.tsx b/apps/mobile/components/bookmarks/TagPill.tsx index 04e01730..eb9945e5 100644 --- a/apps/mobile/components/bookmarks/TagPill.tsx +++ b/apps/mobile/components/bookmarks/TagPill.tsx @@ -1,7 +1,7 @@ import { View } from "react-native"; import { Link } from "expo-router"; -import { ZBookmarkTags } from "@hoarder/shared/types/tags"; +import { ZBookmarkTags } from "@karakeep/shared/types/tags"; export default function TagPill({ tag }: { tag: ZBookmarkTags }) { return ( diff --git a/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx b/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx index 99bb5ab8..115d44c9 100644 --- a/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx +++ b/apps/mobile/components/bookmarks/UpdatingBookmarkList.tsx @@ -1,7 +1,7 @@ import { api } from "@/lib/trpc"; -import type { ZGetBookmarksRequest } from "@hoarder/shared/types/bookmarks"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import type { ZGetBookmarksRequest } from "@karakeep/shared/types/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import FullPageError from "../FullPageError"; import FullPageSpinner from "../ui/FullPageSpinner"; diff --git a/apps/mobile/globals.css b/apps/mobile/globals.css index 7d537499..bf0da7e1 100644 --- a/apps/mobile/globals.css +++ b/apps/mobile/globals.css @@ -1 +1 @@ -@import "@hoarder/tailwind-config/globals"; +@import "@karakeep/tailwind-config/globals"; diff --git a/apps/mobile/lib/providers.tsx b/apps/mobile/lib/providers.tsx index 2c648e2b..938b8aeb 100644 --- a/apps/mobile/lib/providers.tsx +++ b/apps/mobile/lib/providers.tsx @@ -2,7 +2,7 @@ import { useEffect } from "react"; import FullPageSpinner from "@/components/ui/FullPageSpinner"; import { ToastProvider } from "@/components/ui/Toast"; -import { TRPCProvider } from "@hoarder/shared-react/providers/trpc-provider"; +import { TRPCProvider } from "@karakeep/shared-react/providers/trpc-provider"; import useAppSettings from "./settings"; diff --git a/apps/mobile/lib/trpc.ts b/apps/mobile/lib/trpc.ts index 9b025df1..e56968b8 100644 --- a/apps/mobile/lib/trpc.ts +++ b/apps/mobile/lib/trpc.ts @@ -1,5 +1,5 @@ import { createTRPCReact } from "@trpc/react-query"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export const api = createTRPCReact<AppRouter>(); diff --git a/apps/mobile/lib/upload.ts b/apps/mobile/lib/upload.ts index 715119b1..a9157d68 100644 --- a/apps/mobile/lib/upload.ts +++ b/apps/mobile/lib/upload.ts @@ -1,11 +1,11 @@ import ReactNativeBlobUtil from "react-native-blob-util"; import { useMutation } from "@tanstack/react-query"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; import { zUploadErrorSchema, zUploadResponseSchema, -} from "@hoarder/shared/types/uploads"; +} from "@karakeep/shared/types/uploads"; import type { Settings } from "./settings"; import { api } from "./trpc"; diff --git a/apps/mobile/package.json b/apps/mobile/package.json index f94294c3..c17d4f26 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -1,5 +1,5 @@ { - "name": "@hoarder/mobile", + "name": "@karakeep/mobile", "version": "1.0.0", "main": "index.ts", "scripts": { @@ -15,9 +15,9 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/shared-react": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", + "@karakeep/shared-react": "workspace:^0.1.0", + "@karakeep/trpc": "workspace:^0.1.0", "@react-native-menu/menu": "^1.1.6", "@tanstack/react-query": "^5.67.1", "class-variance-authority": "^0.7.0", @@ -60,10 +60,10 @@ }, "devDependencies": { "@babel/core": "^7.20.0", - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tailwind-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tailwind-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@types/react": "^18.2.55", "ajv": "latest", "eslint": "^8.57.0", @@ -76,8 +76,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/react" ], "ignorePatterns": [ "expo-plugins/**", @@ -86,5 +86,5 @@ "plugins/**" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/apps/mobile/tailwind.config.ts b/apps/mobile/tailwind.config.ts index 8d6f3785..03712ec4 100644 --- a/apps/mobile/tailwind.config.ts +++ b/apps/mobile/tailwind.config.ts @@ -1,6 +1,6 @@ import type { Config } from "tailwindcss"; -import base from "@hoarder/tailwind-config/native"; +import base from "@karakeep/tailwind-config/native"; const config = { content: base.content, diff --git a/apps/web/app/api/assets/[assetId]/route.ts b/apps/web/app/api/assets/[assetId]/route.ts index 66ec6754..8abb9080 100644 --- a/apps/web/app/api/assets/[assetId]/route.ts +++ b/apps/web/app/api/assets/[assetId]/route.ts @@ -1,12 +1,12 @@ import { createContextFromRequest } from "@/server/api/client"; import { and, eq } from "drizzle-orm"; -import { assets } from "@hoarder/db/schema"; +import { assets } from "@karakeep/db/schema"; import { createAssetReadStream, getAssetSize, readAssetMetadata, -} from "@hoarder/shared/assetdb"; +} from "@karakeep/shared/assetdb"; export const dynamic = "force-dynamic"; export async function GET( diff --git a/apps/web/app/api/assets/route.ts b/apps/web/app/api/assets/route.ts index b3bd9bc0..e2e1e63e 100644 --- a/apps/web/app/api/assets/route.ts +++ b/apps/web/app/api/assets/route.ts @@ -6,15 +6,15 @@ import { pipeline } from "stream/promises"; import { createContextFromRequest } from "@/server/api/client"; import { TRPCError } from "@trpc/server"; -import type { ZUploadResponse } from "@hoarder/shared/types/uploads"; -import { assets, AssetTypes } from "@hoarder/db/schema"; +import type { ZUploadResponse } from "@karakeep/shared/types/uploads"; +import { assets, AssetTypes } from "@karakeep/db/schema"; import { newAssetId, saveAssetFromFile, SUPPORTED_UPLOAD_ASSET_TYPES, -} from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; -import { AuthedContext } from "@hoarder/trpc"; +} from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; +import { AuthedContext } from "@karakeep/trpc"; const MAX_UPLOAD_SIZE_BYTES = serverConfig.maxAssetSizeMb * 1024 * 1024; @@ -57,7 +57,7 @@ export async function uploadFromPostData( let tempFilePath: string | undefined; try { - tempFilePath = path.join(os.tmpdir(), `hoarder-upload-${Date.now()}`); + tempFilePath = path.join(os.tmpdir(), `karakeep-upload-${Date.now()}`); await pipeline( webStreamToNode(data.stream()), fs.createWriteStream(tempFilePath), diff --git a/apps/web/app/api/bookmarks/export/route.tsx b/apps/web/app/api/bookmarks/export/route.tsx index 7ae46c56..4e04757f 100644 --- a/apps/web/app/api/bookmarks/export/route.tsx +++ b/apps/web/app/api/bookmarks/export/route.tsx @@ -2,7 +2,7 @@ import { toExportFormat, zExportSchema } from "@/lib/exportBookmarks"; import { api, createContextFromRequest } from "@/server/api/client"; import { z } from "zod"; -import { MAX_NUM_BOOKMARKS_PER_PAGE } from "@hoarder/shared/types/bookmarks"; +import { MAX_NUM_BOOKMARKS_PER_PAGE } from "@karakeep/shared/types/bookmarks"; export const dynamic = "force-dynamic"; export async function GET(request: Request) { diff --git a/apps/web/app/api/trpc/[trpc]/route.ts b/apps/web/app/api/trpc/[trpc]/route.ts index 1afcb886..87e262f3 100644 --- a/apps/web/app/api/trpc/[trpc]/route.ts +++ b/apps/web/app/api/trpc/[trpc]/route.ts @@ -1,7 +1,7 @@ import { createContextFromRequest } from "@/server/api/client"; import { fetchRequestHandler } from "@trpc/server/adapters/fetch"; -import { appRouter } from "@hoarder/trpc/routers/_app"; +import { appRouter } from "@karakeep/trpc/routers/_app"; const handler = (req: Request) => fetchRequestHandler({ diff --git a/apps/web/app/api/v1/bookmarks/[bookmarkId]/assets/route.ts b/apps/web/app/api/v1/bookmarks/[bookmarkId]/assets/route.ts index 156876b6..6c7c70d7 100644 --- a/apps/web/app/api/v1/bookmarks/[bookmarkId]/assets/route.ts +++ b/apps/web/app/api/v1/bookmarks/[bookmarkId]/assets/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; -import { zAssetSchema } from "@hoarder/shared/types/bookmarks"; +import { zAssetSchema } from "@karakeep/shared/types/bookmarks"; export const dynamic = "force-dynamic"; diff --git a/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts b/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts index 8fe4d9fe..db78f17c 100644 --- a/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts +++ b/apps/web/app/api/v1/bookmarks/[bookmarkId]/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; -import { zUpdateBookmarksRequestSchema } from "@hoarder/shared/types/bookmarks"; +import { zUpdateBookmarksRequestSchema } from "@karakeep/shared/types/bookmarks"; export const dynamic = "force-dynamic"; diff --git a/apps/web/app/api/v1/bookmarks/[bookmarkId]/tags/route.ts b/apps/web/app/api/v1/bookmarks/[bookmarkId]/tags/route.ts index df464618..00c28afa 100644 --- a/apps/web/app/api/v1/bookmarks/[bookmarkId]/tags/route.ts +++ b/apps/web/app/api/v1/bookmarks/[bookmarkId]/tags/route.ts @@ -2,7 +2,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; import { z } from "zod"; -import { zManipulatedTagSchema } from "@hoarder/shared/types/bookmarks"; +import { zManipulatedTagSchema } from "@karakeep/shared/types/bookmarks"; export const dynamic = "force-dynamic"; diff --git a/apps/web/app/api/v1/bookmarks/route.ts b/apps/web/app/api/v1/bookmarks/route.ts index 1342f070..7b6954c6 100644 --- a/apps/web/app/api/v1/bookmarks/route.ts +++ b/apps/web/app/api/v1/bookmarks/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { z } from "zod"; -import { zNewBookmarkRequestSchema } from "@hoarder/shared/types/bookmarks"; +import { zNewBookmarkRequestSchema } from "@karakeep/shared/types/bookmarks"; import { buildHandler } from "../utils/handler"; import { adaptPagination, zPagination } from "../utils/pagination"; diff --git a/apps/web/app/api/v1/bookmarks/singlefile/route.ts b/apps/web/app/api/v1/bookmarks/singlefile/route.ts index 3f8ac2f7..7c1d7201 100644 --- a/apps/web/app/api/v1/bookmarks/singlefile/route.ts +++ b/apps/web/app/api/v1/bookmarks/singlefile/route.ts @@ -1,10 +1,10 @@ import { createContextFromRequest } from "@/server/api/client"; import { TRPCError } from "@trpc/server"; -import serverConfig from "@hoarder/shared/config"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; -import { createCallerFactory } from "@hoarder/trpc"; -import { appRouter } from "@hoarder/trpc/routers/_app"; +import serverConfig from "@karakeep/shared/config"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; +import { createCallerFactory } from "@karakeep/trpc"; +import { appRouter } from "@karakeep/trpc/routers/_app"; import { uploadFromPostData } from "../../../assets/route"; diff --git a/apps/web/app/api/v1/highlights/[highlightId]/route.ts b/apps/web/app/api/v1/highlights/[highlightId]/route.ts index aa92e7ce..50420427 100644 --- a/apps/web/app/api/v1/highlights/[highlightId]/route.ts +++ b/apps/web/app/api/v1/highlights/[highlightId]/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; -import { zUpdateHighlightSchema } from "@hoarder/shared/types/highlights"; +import { zUpdateHighlightSchema } from "@karakeep/shared/types/highlights"; export const dynamic = "force-dynamic"; diff --git a/apps/web/app/api/v1/highlights/route.ts b/apps/web/app/api/v1/highlights/route.ts index a324d498..e95d84f6 100644 --- a/apps/web/app/api/v1/highlights/route.ts +++ b/apps/web/app/api/v1/highlights/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; -import { zNewHighlightSchema } from "@hoarder/shared/types/highlights"; +import { zNewHighlightSchema } from "@karakeep/shared/types/highlights"; import { adaptPagination, zPagination } from "../utils/pagination"; diff --git a/apps/web/app/api/v1/lists/[listId]/route.ts b/apps/web/app/api/v1/lists/[listId]/route.ts index 3fd0a32d..2cddbfdb 100644 --- a/apps/web/app/api/v1/lists/[listId]/route.ts +++ b/apps/web/app/api/v1/lists/[listId]/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; -import { zEditBookmarkListSchema } from "@hoarder/shared/types/lists"; +import { zEditBookmarkListSchema } from "@karakeep/shared/types/lists"; export const dynamic = "force-dynamic"; diff --git a/apps/web/app/api/v1/lists/route.ts b/apps/web/app/api/v1/lists/route.ts index 724fadf2..5def2506 100644 --- a/apps/web/app/api/v1/lists/route.ts +++ b/apps/web/app/api/v1/lists/route.ts @@ -1,6 +1,6 @@ import { NextRequest } from "next/server"; -import { zNewBookmarkListSchema } from "@hoarder/shared/types/lists"; +import { zNewBookmarkListSchema } from "@karakeep/shared/types/lists"; import { buildHandler } from "../utils/handler"; diff --git a/apps/web/app/api/v1/tags/[tagId]/route.ts b/apps/web/app/api/v1/tags/[tagId]/route.ts index 29b27218..234d952d 100644 --- a/apps/web/app/api/v1/tags/[tagId]/route.ts +++ b/apps/web/app/api/v1/tags/[tagId]/route.ts @@ -1,7 +1,7 @@ import { NextRequest } from "next/server"; import { buildHandler } from "@/app/api/v1/utils/handler"; -import { zUpdateTagRequestSchema } from "@hoarder/shared/types/tags"; +import { zUpdateTagRequestSchema } from "@karakeep/shared/types/tags"; export const dynamic = "force-dynamic"; diff --git a/apps/web/app/api/v1/utils/handler.ts b/apps/web/app/api/v1/utils/handler.ts index 84847d71..9154506d 100644 --- a/apps/web/app/api/v1/utils/handler.ts +++ b/apps/web/app/api/v1/utils/handler.ts @@ -6,7 +6,7 @@ import { import { TRPCError } from "@trpc/server"; import { z, ZodError } from "zod"; -import { Context } from "@hoarder/trpc"; +import { Context } from "@karakeep/trpc"; function trpcCodeToHttpCode(code: TRPCError["code"]) { switch (code) { diff --git a/apps/web/app/api/v1/utils/pagination.ts b/apps/web/app/api/v1/utils/pagination.ts index 1b438217..12a0b950 100644 --- a/apps/web/app/api/v1/utils/pagination.ts +++ b/apps/web/app/api/v1/utils/pagination.ts @@ -1,7 +1,7 @@ import { z } from "zod"; -import { MAX_NUM_BOOKMARKS_PER_PAGE } from "@hoarder/shared/types/bookmarks"; -import { zCursorV2 } from "@hoarder/shared/types/pagination"; +import { MAX_NUM_BOOKMARKS_PER_PAGE } from "@karakeep/shared/types/bookmarks"; +import { zCursorV2 } from "@karakeep/shared/types/pagination"; export const zPagination = z.object({ limit: z.coerce.number().max(MAX_NUM_BOOKMARKS_PER_PAGE).optional(), diff --git a/apps/web/app/dashboard/layout.tsx b/apps/web/app/dashboard/layout.tsx index 272979f3..45b97653 100644 --- a/apps/web/app/dashboard/layout.tsx +++ b/apps/web/app/dashboard/layout.tsx @@ -16,7 +16,7 @@ import { Tag, } from "lucide-react"; -import serverConfig from "@hoarder/shared/config"; +import serverConfig from "@karakeep/shared/config"; export default async function Dashboard({ children, diff --git a/apps/web/app/dashboard/lists/[listId]/page.tsx b/apps/web/app/dashboard/lists/[listId]/page.tsx index 159730a1..6c0bc36c 100644 --- a/apps/web/app/dashboard/lists/[listId]/page.tsx +++ b/apps/web/app/dashboard/lists/[listId]/page.tsx @@ -4,7 +4,7 @@ import ListHeader from "@/components/dashboard/lists/ListHeader"; import { api } from "@/server/api/client"; import { TRPCError } from "@trpc/server"; -import { BookmarkListContextProvider } from "@hoarder/shared-react/hooks/bookmark-list-context"; +import { BookmarkListContextProvider } from "@karakeep/shared-react/hooks/bookmark-list-context"; export default async function ListPage({ params, diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx index 3eb017ad..6b75edf3 100644 --- a/apps/web/app/layout.tsx +++ b/apps/web/app/layout.tsx @@ -1,7 +1,7 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; -import "@hoarder/tailwind-config/globals.css"; +import "@karakeep/tailwind-config/globals.css"; import type { Viewport } from "next"; import React from "react"; @@ -11,7 +11,7 @@ import { getUserLocalSettings } from "@/lib/userLocalSettings/userLocalSettings" import { getServerAuthSession } from "@/server/auth"; import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; -import { clientConfig } from "@hoarder/shared/config"; +import { clientConfig } from "@karakeep/shared/config"; const inter = Inter({ subsets: ["latin"], diff --git a/apps/web/app/settings/assets/page.tsx b/apps/web/app/settings/assets/page.tsx index a6c13525..0b3c2b5b 100644 --- a/apps/web/app/settings/assets/page.tsx +++ b/apps/web/app/settings/assets/page.tsx @@ -20,12 +20,12 @@ import { api } from "@/lib/trpc"; import { formatBytes } from "@/lib/utils"; import { ExternalLink, Trash2 } from "lucide-react"; -import { useDetachBookmarkAsset } from "@hoarder/shared-react/hooks/assets"; -import { getAssetUrl } from "@hoarder/shared-react/utils/assetUtils"; +import { useDetachBookmarkAsset } from "@karakeep/shared-react/hooks/assets"; +import { getAssetUrl } from "@karakeep/shared-react/utils/assetUtils"; import { humanFriendlyNameForAssertType, isAllowedToDetachAsset, -} from "@hoarder/trpc/lib/attachments"; +} from "@karakeep/trpc/lib/attachments"; export default function AssetsSettingsPage() { const { t } = useTranslation(); diff --git a/apps/web/app/settings/broken-links/page.tsx b/apps/web/app/settings/broken-links/page.tsx index 0b83dfa9..e2b42d07 100644 --- a/apps/web/app/settings/broken-links/page.tsx +++ b/apps/web/app/settings/broken-links/page.tsx @@ -17,8 +17,8 @@ import { useTranslation } from "react-i18next"; import { useDeleteBookmark, useRecrawlBookmark, -} from "@hoarder/shared-react/hooks/bookmarks"; -import { api } from "@hoarder/shared-react/trpc"; +} from "@karakeep/shared-react/hooks/bookmarks"; +import { api } from "@karakeep/shared-react/trpc"; export default function BrokenLinksPage() { const { t } = useTranslation(); diff --git a/apps/web/components/admin/AddUserDialog.tsx b/apps/web/components/admin/AddUserDialog.tsx index a13c6b88..67c38501 100644 --- a/apps/web/components/admin/AddUserDialog.tsx +++ b/apps/web/components/admin/AddUserDialog.tsx @@ -33,7 +33,7 @@ import { TRPCClientError } from "@trpc/client"; import { useForm } from "react-hook-form";
import { z } from "zod";
-import { zAdminCreateUserSchema } from "@hoarder/shared/types/admin";
+import { zAdminCreateUserSchema } from "@karakeep/shared/types/admin";
type AdminCreateUserSchema = z.infer<typeof zAdminCreateUserSchema>;
diff --git a/apps/web/components/admin/ChangeRoleDialog.tsx b/apps/web/components/admin/ChangeRoleDialog.tsx index 26ad5dce..e2552a15 100644 --- a/apps/web/components/admin/ChangeRoleDialog.tsx +++ b/apps/web/components/admin/ChangeRoleDialog.tsx @@ -32,7 +32,7 @@ import { TRPCClientError } from "@trpc/client"; import { useForm } from "react-hook-form";
import { z } from "zod";
-import { changeRoleSchema } from "@hoarder/shared/types/admin";
+import { changeRoleSchema } from "@karakeep/shared/types/admin";
type ChangeRoleSchema = z.infer<typeof changeRoleSchema>;
diff --git a/apps/web/components/admin/ResetPasswordDialog.tsx b/apps/web/components/admin/ResetPasswordDialog.tsx index 32183d1a..cc2a95f5 100644 --- a/apps/web/components/admin/ResetPasswordDialog.tsx +++ b/apps/web/components/admin/ResetPasswordDialog.tsx @@ -26,7 +26,7 @@ import { TRPCClientError } from "@trpc/client"; import { useForm } from "react-hook-form";
import { z } from "zod";
-import { resetPasswordSchema } from "@hoarder/shared/types/admin";
+import { resetPasswordSchema } from "@karakeep/shared/types/admin";
interface ResetPasswordDialogProps {
userId: string;
diff --git a/apps/web/components/dashboard/BulkBookmarksAction.tsx b/apps/web/components/dashboard/BulkBookmarksAction.tsx index 9d5ecdbe..817521ff 100644 --- a/apps/web/components/dashboard/BulkBookmarksAction.tsx +++ b/apps/web/components/dashboard/BulkBookmarksAction.tsx @@ -26,9 +26,9 @@ import { useDeleteBookmark, useRecrawlBookmark, useUpdateBookmark, -} from "@hoarder/shared-react/hooks/bookmarks"; -import { limitConcurrency } from "@hoarder/shared/concurrency"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; +import { limitConcurrency } from "@karakeep/shared/concurrency"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import BulkManageListsModal from "./bookmarks/BulkManageListsModal"; import BulkTagModal from "./bookmarks/BulkTagModal"; diff --git a/apps/web/components/dashboard/UploadDropzone.tsx b/apps/web/components/dashboard/UploadDropzone.tsx index 335ac72a..df7bae0a 100644 --- a/apps/web/components/dashboard/UploadDropzone.tsx +++ b/apps/web/components/dashboard/UploadDropzone.tsx @@ -6,8 +6,8 @@ import { cn } from "@/lib/utils"; import { TRPCClientError } from "@trpc/client"; import DropZone from "react-dropzone"; -import { useCreateBookmarkWithPostHook } from "@hoarder/shared-react/hooks/bookmarks"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { useCreateBookmarkWithPostHook } from "@karakeep/shared-react/hooks/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import LoadingSpinner from "../ui/spinner"; import { toast } from "../ui/use-toast"; diff --git a/apps/web/components/dashboard/bookmarks/AssetCard.tsx b/apps/web/components/dashboard/bookmarks/AssetCard.tsx index 0cb75b3f..6fc8a723 100644 --- a/apps/web/components/dashboard/bookmarks/AssetCard.tsx +++ b/apps/web/components/dashboard/bookmarks/AssetCard.tsx @@ -5,9 +5,9 @@ import Link from "next/link"; import { cn } from "@/lib/utils"; import { FileText } from "lucide-react"; -import type { ZBookmarkTypeAsset } from "@hoarder/shared/types/bookmarks"; -import { getAssetUrl } from "@hoarder/shared-react/utils/assetUtils"; -import { getSourceUrl } from "@hoarder/shared-react/utils/bookmarkUtils"; +import type { ZBookmarkTypeAsset } from "@karakeep/shared/types/bookmarks"; +import { getAssetUrl } from "@karakeep/shared-react/utils/assetUtils"; +import { getSourceUrl } from "@karakeep/shared-react/utils/bookmarkUtils"; import { BookmarkLayoutAdaptingCard } from "./BookmarkLayoutAdaptingCard"; import FooterLinkURL from "./FooterLinkURL"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx b/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx index 299f47eb..999653f7 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx @@ -3,7 +3,7 @@ import { buttonVariants } from "@/components/ui/button"; import { cn } from "@/lib/utils"; import { Maximize2 } from "lucide-react"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import BookmarkOptions from "./BookmarkOptions"; import { FavouritedActionIcon } from "./icons"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarkCard.tsx b/apps/web/components/dashboard/bookmarks/BookmarkCard.tsx index 5f8e4e0a..3c92e03e 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkCard.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkCard.tsx @@ -1,7 +1,7 @@ import { api } from "@/lib/trpc"; -import { isBookmarkStillLoading } from "@hoarder/shared-react/utils/bookmarkUtils"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { isBookmarkStillLoading } from "@karakeep/shared-react/utils/bookmarkUtils"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; import AssetCard from "./AssetCard"; import LinkCard from "./LinkCard"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx index a2323987..be061148 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx @@ -12,9 +12,9 @@ import dayjs from "dayjs"; import { Check, Image as ImageIcon, NotebookPen } from "lucide-react"; import { useTheme } from "next-themes"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; -import { isBookmarkStillTagging } from "@hoarder/shared-react/utils/bookmarkUtils"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; +import { isBookmarkStillTagging } from "@karakeep/shared-react/utils/bookmarkUtils"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import BookmarkActionBar from "./BookmarkActionBar"; import TagList from "./TagList"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx b/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx index 9f7f2138..debd5ad9 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkMarkdownComponent.tsx @@ -2,8 +2,8 @@ import MarkdownEditor from "@/components/ui/markdown/markdown-editor"; import { MarkdownReadonly } from "@/components/ui/markdown/markdown-readonly";
import { toast } from "@/components/ui/use-toast";
-import type { ZBookmarkTypeText } from "@hoarder/shared/types/bookmarks";
-import { useUpdateBookmark } from "@hoarder/shared-react/hooks/bookmarks";
+import type { ZBookmarkTypeText } from "@karakeep/shared/types/bookmarks";
+import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks";
export function BookmarkMarkdownComponent({
children: bookmark,
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx b/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx index 039904a0..af746230 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkOptions.tsx @@ -26,15 +26,15 @@ import { import type { ZBookmark, ZBookmarkedLink, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { useRecrawlBookmark, useUpdateBookmark, -} from "@hoarder/shared-react/hooks//bookmarks"; -import { useRemoveBookmarkFromList } from "@hoarder/shared-react/hooks//lists"; -import { useBookmarkGridContext } from "@hoarder/shared-react/hooks/bookmark-grid-context"; -import { useBookmarkListContext } from "@hoarder/shared-react/hooks/bookmark-list-context"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks//bookmarks"; +import { useRemoveBookmarkFromList } from "@karakeep/shared-react/hooks//lists"; +import { useBookmarkGridContext } from "@karakeep/shared-react/hooks/bookmark-grid-context"; +import { useBookmarkListContext } from "@karakeep/shared-react/hooks/bookmark-list-context"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import { BookmarkedTextEditor } from "./BookmarkedTextEditor"; import DeleteBookmarkConfirmationDialog from "./DeleteBookmarkConfirmationDialog"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarkTagsEditor.tsx b/apps/web/components/dashboard/bookmarks/BookmarkTagsEditor.tsx index d6d60d22..fa4f40de 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkTagsEditor.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkTagsEditor.tsx @@ -1,7 +1,7 @@ import { toast } from "@/components/ui/use-toast"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; -import { useUpdateBookmarkTags } from "@hoarder/shared-react/hooks/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; +import { useUpdateBookmarkTags } from "@karakeep/shared-react/hooks/bookmarks"; import { TagsEditor } from "./TagsEditor"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarkedTextEditor.tsx b/apps/web/components/dashboard/bookmarks/BookmarkedTextEditor.tsx index b2c27c7e..bb16967a 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarkedTextEditor.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarkedTextEditor.tsx @@ -6,7 +6,7 @@ import { DialogTitle, } from "@/components/ui/dialog"; -import { ZBookmark, ZBookmarkTypeText } from "@hoarder/shared/types/bookmarks"; +import { ZBookmark, ZBookmarkTypeText } from "@karakeep/shared/types/bookmarks"; export function BookmarkedTextEditor({ bookmark, diff --git a/apps/web/components/dashboard/bookmarks/Bookmarks.tsx b/apps/web/components/dashboard/bookmarks/Bookmarks.tsx index 3f606346..af2e4990 100644 --- a/apps/web/components/dashboard/bookmarks/Bookmarks.tsx +++ b/apps/web/components/dashboard/bookmarks/Bookmarks.tsx @@ -3,7 +3,7 @@ import { Separator } from "@/components/ui/separator"; import { api } from "@/server/api/client"; import { getServerAuthSession } from "@/server/auth"; -import type { ZGetBookmarksRequest } from "@hoarder/shared/types/bookmarks"; +import type { ZGetBookmarksRequest } from "@karakeep/shared/types/bookmarks"; import UpdatableBookmarksGrid from "./UpdatableBookmarksGrid"; diff --git a/apps/web/components/dashboard/bookmarks/BookmarksGrid.tsx b/apps/web/components/dashboard/bookmarks/BookmarksGrid.tsx index 8ac90d0a..21bc5fed 100644 --- a/apps/web/components/dashboard/bookmarks/BookmarksGrid.tsx +++ b/apps/web/components/dashboard/bookmarks/BookmarksGrid.tsx @@ -13,7 +13,7 @@ import { useInView } from "react-intersection-observer"; import Masonry from "react-masonry-css"; import resolveConfig from "tailwindcss/resolveConfig"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import BookmarkCard from "./BookmarkCard"; import EditorCard from "./EditorCard"; diff --git a/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx b/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx index 27e5c5e2..15953826 100644 --- a/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx +++ b/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx @@ -20,8 +20,8 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { useForm } from "react-hook-form"; import { z } from "zod"; -import { useAddBookmarkToList } from "@hoarder/shared-react/hooks/lists"; -import { limitConcurrency } from "@hoarder/shared/concurrency"; +import { useAddBookmarkToList } from "@karakeep/shared-react/hooks/lists"; +import { limitConcurrency } from "@karakeep/shared/concurrency"; import { BookmarkListSelector } from "../lists/BookmarkListSelector"; diff --git a/apps/web/components/dashboard/bookmarks/BulkTagModal.tsx b/apps/web/components/dashboard/bookmarks/BulkTagModal.tsx index 03af9e11..431f0fcd 100644 --- a/apps/web/components/dashboard/bookmarks/BulkTagModal.tsx +++ b/apps/web/components/dashboard/bookmarks/BulkTagModal.tsx @@ -9,10 +9,10 @@ import { } from "@/components/ui/dialog"; import { toast } from "@/components/ui/use-toast"; -import { useUpdateBookmarkTags } from "@hoarder/shared-react/hooks/bookmarks"; -import { api } from "@hoarder/shared-react/trpc"; -import { limitConcurrency } from "@hoarder/shared/concurrency"; -import { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { useUpdateBookmarkTags } from "@karakeep/shared-react/hooks/bookmarks"; +import { api } from "@karakeep/shared-react/trpc"; +import { limitConcurrency } from "@karakeep/shared/concurrency"; +import { ZBookmark } from "@karakeep/shared/types/bookmarks"; import { TagsEditor } from "./TagsEditor"; diff --git a/apps/web/components/dashboard/bookmarks/DeleteBookmarkConfirmationDialog.tsx b/apps/web/components/dashboard/bookmarks/DeleteBookmarkConfirmationDialog.tsx index 4a69e3d0..7e680706 100644 --- a/apps/web/components/dashboard/bookmarks/DeleteBookmarkConfirmationDialog.tsx +++ b/apps/web/components/dashboard/bookmarks/DeleteBookmarkConfirmationDialog.tsx @@ -4,8 +4,8 @@ import ActionConfirmingDialog from "@/components/ui/action-confirming-dialog"; import { toast } from "@/components/ui/use-toast"; import { useTranslation } from "@/lib/i18n/client"; -import { useDeleteBookmark } from "@hoarder/shared-react/hooks//bookmarks"; -import { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { useDeleteBookmark } from "@karakeep/shared-react/hooks//bookmarks"; +import { ZBookmark } from "@karakeep/shared/types/bookmarks"; export default function DeleteBookmarkConfirmationDialog({ bookmark, diff --git a/apps/web/components/dashboard/bookmarks/EditBookmarkDialog.tsx b/apps/web/components/dashboard/bookmarks/EditBookmarkDialog.tsx index 2d47102b..c7745acd 100644 --- a/apps/web/components/dashboard/bookmarks/EditBookmarkDialog.tsx +++ b/apps/web/components/dashboard/bookmarks/EditBookmarkDialog.tsx @@ -34,13 +34,13 @@ import { format } from "date-fns"; import { CalendarIcon } from "lucide-react"; import { useForm } from "react-hook-form"; -import { useUpdateBookmark } from "@hoarder/shared-react/hooks/bookmarks"; +import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks"; import { BookmarkTypes, ZBookmark, ZUpdateBookmarksRequest, zUpdateBookmarksRequestSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { BookmarkTagsEditor } from "./BookmarkTagsEditor"; diff --git a/apps/web/components/dashboard/bookmarks/EditorCard.tsx b/apps/web/components/dashboard/bookmarks/EditorCard.tsx index cb4bfdce..1938fdec 100644 --- a/apps/web/components/dashboard/bookmarks/EditorCard.tsx +++ b/apps/web/components/dashboard/bookmarks/EditorCard.tsx @@ -19,8 +19,8 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { useForm } from "react-hook-form"; import { z } from "zod"; -import { useCreateBookmarkWithPostHook } from "@hoarder/shared-react/hooks/bookmarks"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { useCreateBookmarkWithPostHook } from "@karakeep/shared-react/hooks/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import { useUploadAsset } from "../UploadDropzone"; diff --git a/apps/web/components/dashboard/bookmarks/LinkCard.tsx b/apps/web/components/dashboard/bookmarks/LinkCard.tsx index 34044305..ec224ca6 100644 --- a/apps/web/components/dashboard/bookmarks/LinkCard.tsx +++ b/apps/web/components/dashboard/bookmarks/LinkCard.tsx @@ -3,13 +3,13 @@ import Image from "next/image"; import Link from "next/link"; -import type { ZBookmarkTypeLink } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmarkTypeLink } from "@karakeep/shared/types/bookmarks"; import { getBookmarkLinkImageUrl, getBookmarkTitle, getSourceUrl, isBookmarkStillCrawling, -} from "@hoarder/shared-react/utils/bookmarkUtils"; +} from "@karakeep/shared-react/utils/bookmarkUtils"; import { BookmarkLayoutAdaptingCard } from "./BookmarkLayoutAdaptingCard"; import FooterLinkURL from "./FooterLinkURL"; diff --git a/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx b/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx index dfbd6d45..55ff7ca1 100644 --- a/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx +++ b/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx @@ -29,7 +29,7 @@ import { useAddBookmarkToList, useBookmarkLists, useRemoveBookmarkFromList, -} from "@hoarder/shared-react/hooks/lists"; +} from "@karakeep/shared-react/hooks/lists"; import { BookmarkListSelector } from "../lists/BookmarkListSelector"; import ArchiveBookmarkButton from "./action-buttons/ArchiveBookmarkButton"; diff --git a/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx b/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx index 21554556..2b0d464e 100644 --- a/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx +++ b/apps/web/components/dashboard/bookmarks/SummarizeBookmarkArea.tsx @@ -9,8 +9,8 @@ import { ChevronUp, RefreshCw, Sparkles, Trash2 } from "lucide-react"; import { useSummarizeBookmark, useUpdateBookmark, -} from "@hoarder/shared-react/hooks/bookmarks"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; function AISummary({ bookmarkId, diff --git a/apps/web/components/dashboard/bookmarks/TagList.tsx b/apps/web/components/dashboard/bookmarks/TagList.tsx index ccf3bf09..49a1156c 100644 --- a/apps/web/components/dashboard/bookmarks/TagList.tsx +++ b/apps/web/components/dashboard/bookmarks/TagList.tsx @@ -3,7 +3,7 @@ import { badgeVariants } from "@/components/ui/badge"; import { Skeleton } from "@/components/ui/skeleton"; import { cn } from "@/lib/utils"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; export default function TagList({ bookmark, diff --git a/apps/web/components/dashboard/bookmarks/TagModal.tsx b/apps/web/components/dashboard/bookmarks/TagModal.tsx index 61f462b1..ab17ba71 100644 --- a/apps/web/components/dashboard/bookmarks/TagModal.tsx +++ b/apps/web/components/dashboard/bookmarks/TagModal.tsx @@ -10,7 +10,7 @@ import { } from "@/components/ui/dialog"; import { useTranslation } from "@/lib/i18n/client"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import { BookmarkTagsEditor } from "./BookmarkTagsEditor"; diff --git a/apps/web/components/dashboard/bookmarks/TagsEditor.tsx b/apps/web/components/dashboard/bookmarks/TagsEditor.tsx index 8db93227..5efdd0dd 100644 --- a/apps/web/components/dashboard/bookmarks/TagsEditor.tsx +++ b/apps/web/components/dashboard/bookmarks/TagsEditor.tsx @@ -9,7 +9,7 @@ import CreateableSelect from "react-select/creatable"; import type { ZAttachedByEnum, ZBookmarkTags, -} from "@hoarder/shared/types/tags"; +} from "@karakeep/shared/types/tags"; interface EditableTag { attachedBy: ZAttachedByEnum; diff --git a/apps/web/components/dashboard/bookmarks/TextCard.tsx b/apps/web/components/dashboard/bookmarks/TextCard.tsx index 9d168910..0233357c 100644 --- a/apps/web/components/dashboard/bookmarks/TextCard.tsx +++ b/apps/web/components/dashboard/bookmarks/TextCard.tsx @@ -6,9 +6,9 @@ import { BookmarkMarkdownComponent } from "@/components/dashboard/bookmarks/Book import { bookmarkLayoutSwitch } from "@/lib/userLocalSettings/bookmarksLayout"; import { cn } from "@/lib/utils"; -import type { ZBookmarkTypeText } from "@hoarder/shared/types/bookmarks"; -import { getAssetUrl } from "@hoarder/shared-react/utils/assetUtils"; -import { getSourceUrl } from "@hoarder/shared-react/utils/bookmarkUtils"; +import type { ZBookmarkTypeText } from "@karakeep/shared/types/bookmarks"; +import { getAssetUrl } from "@karakeep/shared-react/utils/assetUtils"; +import { getSourceUrl } from "@karakeep/shared-react/utils/bookmarkUtils"; import { BookmarkLayoutAdaptingCard } from "./BookmarkLayoutAdaptingCard"; import FooterLinkURL from "./FooterLinkURL"; diff --git a/apps/web/components/dashboard/bookmarks/UnknownCard.tsx b/apps/web/components/dashboard/bookmarks/UnknownCard.tsx index 970b5e30..1d0ea8fb 100644 --- a/apps/web/components/dashboard/bookmarks/UnknownCard.tsx +++ b/apps/web/components/dashboard/bookmarks/UnknownCard.tsx @@ -3,7 +3,7 @@ import { useTranslation } from "@/lib/i18n/client"; import { AlertCircle } from "lucide-react"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; import { BookmarkLayoutAdaptingCard } from "./BookmarkLayoutAdaptingCard"; diff --git a/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx b/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx index 292bf0e6..03ea9708 100644 --- a/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx +++ b/apps/web/components/dashboard/bookmarks/UpdatableBookmarksGrid.tsx @@ -8,8 +8,8 @@ import { api } from "@/lib/trpc"; import type { ZGetBookmarksRequest, ZGetBookmarksResponse, -} from "@hoarder/shared/types/bookmarks"; -import { BookmarkGridContextProvider } from "@hoarder/shared-react/hooks/bookmark-grid-context"; +} from "@karakeep/shared/types/bookmarks"; +import { BookmarkGridContextProvider } from "@karakeep/shared-react/hooks/bookmark-grid-context"; import BookmarksGrid from "./BookmarksGrid"; diff --git a/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx b/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx index 671c9bb2..3b8da82f 100644 --- a/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx +++ b/apps/web/components/dashboard/bookmarks/action-buttons/ArchiveBookmarkButton.tsx @@ -3,7 +3,7 @@ import { ActionButton, ActionButtonProps } from "@/components/ui/action-button"; import { toast } from "@/components/ui/use-toast"; import { api } from "@/lib/trpc"; -import { useUpdateBookmark } from "@hoarder/shared-react/hooks/bookmarks"; +import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks"; interface ArchiveBookmarkButtonProps extends Omit<ActionButtonProps, "loading" | "disabled"> { diff --git a/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx b/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx index c9db3dfa..afc70f24 100644 --- a/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx +++ b/apps/web/components/dashboard/cleanups/TagDuplicationDetention.tsx @@ -27,7 +27,7 @@ import { cn } from "@/lib/utils"; import { distance } from "fastest-levenshtein"; import { Check, Combine, X } from "lucide-react"; -import { useMergeTag } from "@hoarder/shared-react/hooks/tags"; +import { useMergeTag } from "@karakeep/shared-react/hooks/tags"; interface Suggestion { mergeIntoId: string; diff --git a/apps/web/components/dashboard/highlights/AllHighlights.tsx b/apps/web/components/dashboard/highlights/AllHighlights.tsx index cbf351de..9f39a471 100644 --- a/apps/web/components/dashboard/highlights/AllHighlights.tsx +++ b/apps/web/components/dashboard/highlights/AllHighlights.tsx @@ -15,7 +15,7 @@ import { useInView } from "react-intersection-observer"; import { ZGetAllHighlightsResponse, ZHighlight, -} from "@hoarder/shared/types/highlights"; +} from "@karakeep/shared/types/highlights"; import HighlightCard from "./HighlightCard"; diff --git a/apps/web/components/dashboard/highlights/HighlightCard.tsx b/apps/web/components/dashboard/highlights/HighlightCard.tsx index 63ff9423..8bb24353 100644 --- a/apps/web/components/dashboard/highlights/HighlightCard.tsx +++ b/apps/web/components/dashboard/highlights/HighlightCard.tsx @@ -3,8 +3,8 @@ import { toast } from "@/components/ui/use-toast"; import { cn } from "@/lib/utils"; import { Trash2 } from "lucide-react"; -import { useDeleteHighlight } from "@hoarder/shared-react/hooks/highlights"; -import { ZHighlight } from "@hoarder/shared/types/highlights"; +import { useDeleteHighlight } from "@karakeep/shared-react/hooks/highlights"; +import { ZHighlight } from "@karakeep/shared/types/highlights"; import { HIGHLIGHT_COLOR_MAP } from "../preview/highlights"; diff --git a/apps/web/components/dashboard/lists/AllListsView.tsx b/apps/web/components/dashboard/lists/AllListsView.tsx index ab6e31d3..6101112d 100644 --- a/apps/web/components/dashboard/lists/AllListsView.tsx +++ b/apps/web/components/dashboard/lists/AllListsView.tsx @@ -7,7 +7,7 @@ import { CollapsibleTriggerChevron } from "@/components/ui/collapsible"; import { useTranslation } from "@/lib/i18n/client"; import { MoreHorizontal, Plus } from "lucide-react"; -import type { ZBookmarkList } from "@hoarder/shared/types/lists"; +import type { ZBookmarkList } from "@karakeep/shared/types/lists"; import { CollapsibleBookmarkLists } from "./CollapsibleBookmarkLists"; import { ListOptions } from "./ListOptions"; diff --git a/apps/web/components/dashboard/lists/BookmarkListSelector.tsx b/apps/web/components/dashboard/lists/BookmarkListSelector.tsx index 144297cf..db37efc0 100644 --- a/apps/web/components/dashboard/lists/BookmarkListSelector.tsx +++ b/apps/web/components/dashboard/lists/BookmarkListSelector.tsx @@ -8,7 +8,7 @@ import { } from "@/components/ui/select"; import LoadingSpinner from "@/components/ui/spinner"; -import { useBookmarkLists } from "@hoarder/shared-react/hooks/lists"; +import { useBookmarkLists } from "@karakeep/shared-react/hooks/lists"; export function BookmarkListSelector({ value, diff --git a/apps/web/components/dashboard/lists/CollapsibleBookmarkLists.tsx b/apps/web/components/dashboard/lists/CollapsibleBookmarkLists.tsx index 522bb1d6..90d4cb3f 100644 --- a/apps/web/components/dashboard/lists/CollapsibleBookmarkLists.tsx +++ b/apps/web/components/dashboard/lists/CollapsibleBookmarkLists.tsx @@ -7,9 +7,9 @@ import { keepPreviousData } from "@tanstack/react-query"; import { augmentBookmarkListsWithInitialData, useBookmarkLists, -} from "@hoarder/shared-react/hooks/lists"; -import { ZBookmarkList } from "@hoarder/shared/types/lists"; -import { ZBookmarkListTreeNode } from "@hoarder/shared/utils/listUtils"; +} from "@karakeep/shared-react/hooks/lists"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; +import { ZBookmarkListTreeNode } from "@karakeep/shared/utils/listUtils"; type RenderFunc = (params: { item: ZBookmarkListTreeNode; diff --git a/apps/web/components/dashboard/lists/DeleteListConfirmationDialog.tsx b/apps/web/components/dashboard/lists/DeleteListConfirmationDialog.tsx index bf1969bf..7eb25e6d 100644 --- a/apps/web/components/dashboard/lists/DeleteListConfirmationDialog.tsx +++ b/apps/web/components/dashboard/lists/DeleteListConfirmationDialog.tsx @@ -3,8 +3,8 @@ import { ActionButton } from "@/components/ui/action-button"; import ActionConfirmingDialog from "@/components/ui/action-confirming-dialog"; import { toast } from "@/components/ui/use-toast"; -import type { ZBookmarkList } from "@hoarder/shared/types/lists"; -import { useDeleteBookmarkList } from "@hoarder/shared-react/hooks/lists"; +import type { ZBookmarkList } from "@karakeep/shared/types/lists"; +import { useDeleteBookmarkList } from "@karakeep/shared-react/hooks/lists"; export default function DeleteListConfirmationDialog({ list, diff --git a/apps/web/components/dashboard/lists/EditListModal.tsx b/apps/web/components/dashboard/lists/EditListModal.tsx index 44daf72b..1851d416 100644 --- a/apps/web/components/dashboard/lists/EditListModal.tsx +++ b/apps/web/components/dashboard/lists/EditListModal.tsx @@ -46,12 +46,12 @@ import { z } from "zod"; import { useCreateBookmarkList, useEditBookmarkList, -} from "@hoarder/shared-react/hooks/lists"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; +} from "@karakeep/shared-react/hooks/lists"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; import { ZBookmarkList, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import QueryExplainerTooltip from "../search/QueryExplainerTooltip"; import { BookmarkListSelector } from "./BookmarkListSelector"; diff --git a/apps/web/components/dashboard/lists/ListHeader.tsx b/apps/web/components/dashboard/lists/ListHeader.tsx index b8bfb4ad..af4a3551 100644 --- a/apps/web/components/dashboard/lists/ListHeader.tsx +++ b/apps/web/components/dashboard/lists/ListHeader.tsx @@ -6,9 +6,9 @@ import { Button } from "@/components/ui/button"; import { useTranslation } from "@/lib/i18n/client"; import { MoreHorizontal, SearchIcon } from "lucide-react"; -import { api } from "@hoarder/shared-react/trpc"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; -import { ZBookmarkList } from "@hoarder/shared/types/lists"; +import { api } from "@karakeep/shared-react/trpc"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; import QueryExplainerTooltip from "../search/QueryExplainerTooltip"; import { ListOptions } from "./ListOptions"; diff --git a/apps/web/components/dashboard/lists/ListOptions.tsx b/apps/web/components/dashboard/lists/ListOptions.tsx index 0e24d6a2..6b900265 100644 --- a/apps/web/components/dashboard/lists/ListOptions.tsx +++ b/apps/web/components/dashboard/lists/ListOptions.tsx @@ -8,7 +8,7 @@ import { import { useTranslation } from "@/lib/i18n/client"; import { Pencil, Plus, Trash2 } from "lucide-react"; -import { ZBookmarkList } from "@hoarder/shared/types/lists"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; import { EditListModal } from "../lists/EditListModal"; import DeleteListConfirmationDialog from "./DeleteListConfirmationDialog"; diff --git a/apps/web/components/dashboard/preview/ActionBar.tsx b/apps/web/components/dashboard/preview/ActionBar.tsx index 62d9c849..6e4cd5a2 100644 --- a/apps/web/components/dashboard/preview/ActionBar.tsx +++ b/apps/web/components/dashboard/preview/ActionBar.tsx @@ -10,8 +10,8 @@ import { toast } from "@/components/ui/use-toast"; import { useTranslation } from "@/lib/i18n/client"; import { Pencil, Trash2 } from "lucide-react"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; -import { useUpdateBookmark } from "@hoarder/shared-react/hooks/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; +import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks"; import DeleteBookmarkConfirmationDialog from "../bookmarks/DeleteBookmarkConfirmationDialog"; import { EditBookmarkDialog } from "../bookmarks/EditBookmarkDialog"; diff --git a/apps/web/components/dashboard/preview/AssetContentSection.tsx b/apps/web/components/dashboard/preview/AssetContentSection.tsx index 8590d2ad..fd299320 100644 --- a/apps/web/components/dashboard/preview/AssetContentSection.tsx +++ b/apps/web/components/dashboard/preview/AssetContentSection.tsx @@ -11,8 +11,8 @@ import { } from "@/components/ui/select"; import { useTranslation } from "@/lib/i18n/client"; -import { getAssetUrl } from "@hoarder/shared-react/utils/assetUtils"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { getAssetUrl } from "@karakeep/shared-react/utils/assetUtils"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; // 20 MB const BIG_FILE_SIZE = 20 * 1024 * 1024; diff --git a/apps/web/components/dashboard/preview/AttachmentBox.tsx b/apps/web/components/dashboard/preview/AttachmentBox.tsx index 19622f8d..15acd799 100644 --- a/apps/web/components/dashboard/preview/AttachmentBox.tsx +++ b/apps/web/components/dashboard/preview/AttachmentBox.tsx @@ -18,14 +18,14 @@ import { useAttachBookmarkAsset, useDetachBookmarkAsset, useReplaceBookmarkAsset, -} from "@hoarder/shared-react/hooks/assets"; -import { getAssetUrl } from "@hoarder/shared-react/utils/assetUtils"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks/assets"; +import { getAssetUrl } from "@karakeep/shared-react/utils/assetUtils"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; import { humanFriendlyNameForAssertType, isAllowedToAttachAsset, isAllowedToDetachAsset, -} from "@hoarder/trpc/lib/attachments"; +} from "@karakeep/trpc/lib/attachments"; export default function AttachmentBox({ bookmark }: { bookmark: ZBookmark }) { const { t } = useTranslation(); diff --git a/apps/web/components/dashboard/preview/BookmarkHtmlHighlighter.tsx b/apps/web/components/dashboard/preview/BookmarkHtmlHighlighter.tsx index bed229a6..a3b34f9a 100644 --- a/apps/web/components/dashboard/preview/BookmarkHtmlHighlighter.tsx +++ b/apps/web/components/dashboard/preview/BookmarkHtmlHighlighter.tsx @@ -9,7 +9,7 @@ import { Check, Trash2 } from "lucide-react"; import { SUPPORTED_HIGHLIGHT_COLORS, ZHighlightColor, -} from "@hoarder/shared/types/highlights"; +} from "@karakeep/shared/types/highlights"; import { HIGHLIGHT_COLOR_MAP } from "./highlights"; diff --git a/apps/web/components/dashboard/preview/BookmarkPreview.tsx b/apps/web/components/dashboard/preview/BookmarkPreview.tsx index 07ae0809..df09f687 100644 --- a/apps/web/components/dashboard/preview/BookmarkPreview.tsx +++ b/apps/web/components/dashboard/preview/BookmarkPreview.tsx @@ -22,8 +22,8 @@ import { getSourceUrl, isBookmarkStillCrawling, isBookmarkStillLoading, -} from "@hoarder/shared-react/utils/bookmarkUtils"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/utils/bookmarkUtils"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; import SummarizeBookmarkArea from "../bookmarks/SummarizeBookmarkArea"; import ActionBar from "./ActionBar"; diff --git a/apps/web/components/dashboard/preview/LinkContentSection.tsx b/apps/web/components/dashboard/preview/LinkContentSection.tsx index f1fe3820..f37f110e 100644 --- a/apps/web/components/dashboard/preview/LinkContentSection.tsx +++ b/apps/web/components/dashboard/preview/LinkContentSection.tsx @@ -18,12 +18,12 @@ import { useCreateHighlight, useDeleteHighlight, useUpdateHighlight, -} from "@hoarder/shared-react/hooks/highlights"; +} from "@karakeep/shared-react/hooks/highlights"; import { BookmarkTypes, ZBookmark, ZBookmarkedLink, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; function FullPageArchiveSection({ link }: { link: ZBookmarkedLink }) { const archiveAssetId = diff --git a/apps/web/components/dashboard/preview/NoteEditor.tsx b/apps/web/components/dashboard/preview/NoteEditor.tsx index 67da40cc..393628b5 100644 --- a/apps/web/components/dashboard/preview/NoteEditor.tsx +++ b/apps/web/components/dashboard/preview/NoteEditor.tsx @@ -2,8 +2,8 @@ import { Textarea } from "@/components/ui/textarea"; import { toast } from "@/components/ui/use-toast"; import { useClientConfig } from "@/lib/clientConfig"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; -import { useUpdateBookmark } from "@hoarder/shared-react/hooks/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; +import { useUpdateBookmark } from "@karakeep/shared-react/hooks/bookmarks"; export function NoteEditor({ bookmark }: { bookmark: ZBookmark }) { const demoMode = !!useClientConfig().demoMode; diff --git a/apps/web/components/dashboard/preview/TextContentSection.tsx b/apps/web/components/dashboard/preview/TextContentSection.tsx index a58bc717..0c1aae67 100644 --- a/apps/web/components/dashboard/preview/TextContentSection.tsx +++ b/apps/web/components/dashboard/preview/TextContentSection.tsx @@ -2,9 +2,9 @@ import Image from "next/image"; import { BookmarkMarkdownComponent } from "@/components/dashboard/bookmarks/BookmarkMarkdownComponent"; import { ScrollArea } from "@radix-ui/react-scroll-area"; -import type { ZBookmarkTypeText } from "@hoarder/shared/types/bookmarks"; -import { getAssetUrl } from "@hoarder/shared-react/utils/assetUtils"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmarkTypeText } from "@karakeep/shared/types/bookmarks"; +import { getAssetUrl } from "@karakeep/shared-react/utils/assetUtils"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; export function TextContentSection({ bookmark }: { bookmark: ZBookmark }) { if (bookmark.content.type != BookmarkTypes.TEXT) { diff --git a/apps/web/components/dashboard/search/QueryExplainerTooltip.tsx b/apps/web/components/dashboard/search/QueryExplainerTooltip.tsx index ee99eb8d..89c15ad5 100644 --- a/apps/web/components/dashboard/search/QueryExplainerTooltip.tsx +++ b/apps/web/components/dashboard/search/QueryExplainerTooltip.tsx @@ -3,8 +3,8 @@ import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table"; import { useTranslation } from "@/lib/i18n/client"; import { match } from "@/lib/utils"; -import { TextAndMatcher } from "@hoarder/shared/searchQueryParser"; -import { Matcher } from "@hoarder/shared/types/search"; +import { TextAndMatcher } from "@karakeep/shared/searchQueryParser"; +import { Matcher } from "@karakeep/shared/types/search"; export default function QueryExplainerTooltip({ parsedSearchQuery, diff --git a/apps/web/components/dashboard/sidebar/AllLists.tsx b/apps/web/components/dashboard/sidebar/AllLists.tsx index f31ced62..823f439f 100644 --- a/apps/web/components/dashboard/sidebar/AllLists.tsx +++ b/apps/web/components/dashboard/sidebar/AllLists.tsx @@ -11,8 +11,8 @@ import { useTranslation } from "@/lib/i18n/client"; import { cn } from "@/lib/utils"; import { MoreHorizontal, Plus } from "lucide-react"; -import type { ZBookmarkList } from "@hoarder/shared/types/lists"; -import { ZBookmarkListTreeNode } from "@hoarder/shared/utils/listUtils"; +import type { ZBookmarkList } from "@karakeep/shared/types/lists"; +import { ZBookmarkListTreeNode } from "@karakeep/shared/utils/listUtils"; import { CollapsibleBookmarkLists } from "../lists/CollapsibleBookmarkLists"; import { EditListModal } from "../lists/EditListModal"; diff --git a/apps/web/components/dashboard/tags/AllTagsView.tsx b/apps/web/components/dashboard/tags/AllTagsView.tsx index d8471cf5..a1af5a56 100644 --- a/apps/web/components/dashboard/tags/AllTagsView.tsx +++ b/apps/web/components/dashboard/tags/AllTagsView.tsx @@ -18,8 +18,8 @@ import { useTranslation } from "@/lib/i18n/client"; import { api } from "@/lib/trpc"; import { ArrowDownAZ, Combine } from "lucide-react"; -import type { ZGetTagResponse, ZTagBasic } from "@hoarder/shared/types/tags"; -import { useDeleteUnusedTags } from "@hoarder/shared-react/hooks/tags"; +import type { ZGetTagResponse, ZTagBasic } from "@karakeep/shared/types/tags"; +import { useDeleteUnusedTags } from "@karakeep/shared-react/hooks/tags"; import BulkTagAction from "./BulkTagAction"; import DeleteTagConfirmationDialog from "./DeleteTagConfirmationDialog"; diff --git a/apps/web/components/dashboard/tags/BulkTagAction.tsx b/apps/web/components/dashboard/tags/BulkTagAction.tsx index c559b9cf..95f7c46d 100644 --- a/apps/web/components/dashboard/tags/BulkTagAction.tsx +++ b/apps/web/components/dashboard/tags/BulkTagAction.tsx @@ -10,8 +10,8 @@ import useBulkTagActionsStore from "@/lib/bulkTagActions"; import { useTranslation } from "@/lib/i18n/client"; import { CheckCheck, Pencil, Trash2, X } from "lucide-react"; -import { useDeleteTag } from "@hoarder/shared-react/hooks/tags"; -import { limitConcurrency } from "@hoarder/shared/concurrency"; +import { useDeleteTag } from "@karakeep/shared-react/hooks/tags"; +import { limitConcurrency } from "@karakeep/shared/concurrency"; const MAX_CONCURRENT_BULK_ACTIONS = 50; diff --git a/apps/web/components/dashboard/tags/DeleteTagConfirmationDialog.tsx b/apps/web/components/dashboard/tags/DeleteTagConfirmationDialog.tsx index 998ac9b8..0a589ee6 100644 --- a/apps/web/components/dashboard/tags/DeleteTagConfirmationDialog.tsx +++ b/apps/web/components/dashboard/tags/DeleteTagConfirmationDialog.tsx @@ -3,7 +3,7 @@ import { ActionButton } from "@/components/ui/action-button"; import ActionConfirmingDialog from "@/components/ui/action-confirming-dialog"; import { toast } from "@/components/ui/use-toast"; -import { useDeleteTag } from "@hoarder/shared-react/hooks/tags"; +import { useDeleteTag } from "@karakeep/shared-react/hooks/tags"; export default function DeleteTagConfirmationDialog({ tag, diff --git a/apps/web/components/dashboard/tags/EditableTagName.tsx b/apps/web/components/dashboard/tags/EditableTagName.tsx index 9c8919b7..7854be32 100644 --- a/apps/web/components/dashboard/tags/EditableTagName.tsx +++ b/apps/web/components/dashboard/tags/EditableTagName.tsx @@ -4,7 +4,7 @@ import { usePathname, useRouter } from "next/navigation"; import { toast } from "@/components/ui/use-toast"; import { cn } from "@/lib/utils"; -import { useUpdateTag } from "@hoarder/shared-react/hooks/tags"; +import { useUpdateTag } from "@karakeep/shared-react/hooks/tags"; import { EditableText } from "../EditableText"; diff --git a/apps/web/components/dashboard/tags/MergeTagModal.tsx b/apps/web/components/dashboard/tags/MergeTagModal.tsx index 266cc5d2..b38c5713 100644 --- a/apps/web/components/dashboard/tags/MergeTagModal.tsx +++ b/apps/web/components/dashboard/tags/MergeTagModal.tsx @@ -23,7 +23,7 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { useForm } from "react-hook-form"; import { z } from "zod"; -import { useMergeTag } from "@hoarder/shared-react/hooks/tags"; +import { useMergeTag } from "@karakeep/shared-react/hooks/tags"; import { TagSelector } from "./TagSelector"; diff --git a/apps/web/components/dashboard/tags/TagPill.tsx b/apps/web/components/dashboard/tags/TagPill.tsx index ff17f224..c6b08d64 100644 --- a/apps/web/components/dashboard/tags/TagPill.tsx +++ b/apps/web/components/dashboard/tags/TagPill.tsx @@ -7,7 +7,7 @@ import { useDragAndDrop } from "@/lib/drag-and-drop"; import { X } from "lucide-react"; import Draggable from "react-draggable"; -import { useMergeTag } from "@hoarder/shared-react/hooks/tags"; +import { useMergeTag } from "@karakeep/shared-react/hooks/tags"; export function TagPill({ id, diff --git a/apps/web/components/settings/AISettings.tsx b/apps/web/components/settings/AISettings.tsx index 1987f763..6ec71a91 100644 --- a/apps/web/components/settings/AISettings.tsx +++ b/apps/web/components/settings/AISettings.tsx @@ -31,12 +31,12 @@ import { buildImagePrompt, buildSummaryPrompt, buildTextPrompt, -} from "@hoarder/shared/prompts"; +} from "@karakeep/shared/prompts"; import { zNewPromptSchema, ZPrompt, zUpdatePromptSchema, -} from "@hoarder/shared/types/prompts"; +} from "@karakeep/shared/types/prompts"; export function PromptEditor() { const { t } = useTranslation(); diff --git a/apps/web/components/settings/ChangePassword.tsx b/apps/web/components/settings/ChangePassword.tsx index e9f426a6..f8c2b8dd 100644 --- a/apps/web/components/settings/ChangePassword.tsx +++ b/apps/web/components/settings/ChangePassword.tsx @@ -17,7 +17,7 @@ import { api } from "@/lib/trpc"; import { zodResolver } from "@hookform/resolvers/zod"; import { useForm } from "react-hook-form"; -import { zChangePasswordSchema } from "@hoarder/shared/types/users"; +import { zChangePasswordSchema } from "@karakeep/shared/types/users"; export function ChangePassword() { const { t } = useTranslation(); diff --git a/apps/web/components/settings/FeedSettings.tsx b/apps/web/components/settings/FeedSettings.tsx index e3999cb5..f5e72372 100644 --- a/apps/web/components/settings/FeedSettings.tsx +++ b/apps/web/components/settings/FeedSettings.tsx @@ -36,7 +36,7 @@ import { ZFeed, zNewFeedSchema, zUpdateFeedSchema, -} from "@hoarder/shared/types/feeds"; +} from "@karakeep/shared/types/feeds"; import ActionConfirmingDialog from "../ui/action-confirming-dialog"; import { Button, buttonVariants } from "../ui/button"; diff --git a/apps/web/components/settings/ImportExport.tsx b/apps/web/components/settings/ImportExport.tsx index 3d78a7b4..d6086c97 100644 --- a/apps/web/components/settings/ImportExport.tsx +++ b/apps/web/components/settings/ImportExport.tsx @@ -25,13 +25,13 @@ import { Download, Upload } from "lucide-react"; import { useCreateBookmarkWithPostHook, useUpdateBookmarkTags, -} from "@hoarder/shared-react/hooks/bookmarks"; +} from "@karakeep/shared-react/hooks/bookmarks"; import { useAddBookmarkToList, useCreateBookmarkList, -} from "@hoarder/shared-react/hooks/lists"; -import { limitConcurrency } from "@hoarder/shared/concurrency"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared-react/hooks/lists"; +import { limitConcurrency } from "@karakeep/shared/concurrency"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import { Card, CardContent } from "../ui/card"; diff --git a/apps/web/components/settings/UserOptions.tsx b/apps/web/components/settings/UserOptions.tsx index 38dc1520..33ffc46a 100644 --- a/apps/web/components/settings/UserOptions.tsx +++ b/apps/web/components/settings/UserOptions.tsx @@ -4,7 +4,7 @@ import { useTranslation } from "@/lib/i18n/client"; import { useInterfaceLang } from "@/lib/userLocalSettings/bookmarksLayout"; import { updateInterfaceLang } from "@/lib/userLocalSettings/userLocalSettings"; -import { langNameMappings } from "@hoarder/shared/langs"; +import { langNameMappings } from "@karakeep/shared/langs"; import { Label } from "../ui/label"; import { diff --git a/apps/web/components/settings/WebhookEventSelector.tsx b/apps/web/components/settings/WebhookEventSelector.tsx index ef357754..6321b8a0 100644 --- a/apps/web/components/settings/WebhookEventSelector.tsx +++ b/apps/web/components/settings/WebhookEventSelector.tsx @@ -17,7 +17,7 @@ import { Check, ChevronsUpDown } from "lucide-react"; import { ZWebhookEvent, zWebhookEventSchema, -} from "@hoarder/shared/types/webhooks"; +} from "@karakeep/shared/types/webhooks"; export function WebhookEventSelector({ value, diff --git a/apps/web/components/settings/WebhookSettings.tsx b/apps/web/components/settings/WebhookSettings.tsx index 4f7f72dc..05ca0615 100644 --- a/apps/web/components/settings/WebhookSettings.tsx +++ b/apps/web/components/settings/WebhookSettings.tsx @@ -24,7 +24,7 @@ import { zNewWebhookSchema, zUpdateWebhookSchema, ZWebhook, -} from "@hoarder/shared/types/webhooks"; +} from "@karakeep/shared/types/webhooks"; import ActionConfirmingDialog from "../ui/action-confirming-dialog"; import { Button } from "../ui/button"; diff --git a/apps/web/components/shared/sidebar/Sidebar.tsx b/apps/web/components/shared/sidebar/Sidebar.tsx index 7ddb5c1e..8bd52e1f 100644 --- a/apps/web/components/shared/sidebar/Sidebar.tsx +++ b/apps/web/components/shared/sidebar/Sidebar.tsx @@ -2,7 +2,7 @@ import Link from "next/link"; import { useTranslation } from "@/lib/i18n/server"; import { TFunction } from "i18next"; -import serverConfig from "@hoarder/shared/config"; +import serverConfig from "@karakeep/shared/config"; import SidebarItem from "./SidebarItem"; import { TSidebarItem } from "./TSidebarItem"; diff --git a/apps/web/components/shared/sidebar/SidebarLayout.tsx b/apps/web/components/shared/sidebar/SidebarLayout.tsx index 2a2a872e..8ea8655e 100644 --- a/apps/web/components/shared/sidebar/SidebarLayout.tsx +++ b/apps/web/components/shared/sidebar/SidebarLayout.tsx @@ -3,7 +3,7 @@ import DemoModeBanner from "@/components/DemoModeBanner"; import { Separator } from "@/components/ui/separator"; import ValidAccountCheck from "@/components/utils/ValidAccountCheck"; -import serverConfig from "@hoarder/shared/config"; +import serverConfig from "@karakeep/shared/config"; export default function SidebarLayout({ children, diff --git a/apps/web/components/signin/CredentialsForm.tsx b/apps/web/components/signin/CredentialsForm.tsx index 6a1bf985..3772db09 100644 --- a/apps/web/components/signin/CredentialsForm.tsx +++ b/apps/web/components/signin/CredentialsForm.tsx @@ -21,7 +21,7 @@ import { signIn } from "next-auth/react"; import { useForm } from "react-hook-form"; import { z } from "zod"; -import { zSignUpSchema } from "@hoarder/shared/types/users"; +import { zSignUpSchema } from "@karakeep/shared/types/users"; const signInSchema = z.object({ email: z.string().email(), diff --git a/apps/web/components/signin/SignInForm.tsx b/apps/web/components/signin/SignInForm.tsx index 5991d2f2..07e921b0 100644 --- a/apps/web/components/signin/SignInForm.tsx +++ b/apps/web/components/signin/SignInForm.tsx @@ -1,6 +1,6 @@ import { getProviders } from "next-auth/react"; -import serverConfig from "@hoarder/shared/config"; +import serverConfig from "@karakeep/shared/config"; import CredentialsForm from "./CredentialsForm"; import SignInProviderButton from "./SignInProviderButton"; diff --git a/apps/web/lib/attachments.tsx b/apps/web/lib/attachments.tsx index 8110d6ce..62848d33 100644 --- a/apps/web/lib/attachments.tsx +++ b/apps/web/lib/attachments.tsx @@ -1,6 +1,6 @@ import { Archive, Camera, Image, Paperclip, Video } from "lucide-react"; -import { ZAssetType } from "@hoarder/shared/types/bookmarks"; +import { ZAssetType } from "@karakeep/shared/types/bookmarks"; export const ASSET_TYPE_TO_ICON: Record<ZAssetType, React.ReactNode> = { screenshot: <Camera className="size-4" />, diff --git a/apps/web/lib/bulkActions.ts b/apps/web/lib/bulkActions.ts index a2ee6a29..34a236c6 100644 --- a/apps/web/lib/bulkActions.ts +++ b/apps/web/lib/bulkActions.ts @@ -1,7 +1,7 @@ // reference article https://refine.dev/blog/zustand-react-state/#build-a-to-do-app-using-zustand import { create } from "zustand"; -import type { ZBookmark } from "@hoarder/shared/types/bookmarks"; +import type { ZBookmark } from "@karakeep/shared/types/bookmarks"; interface BookmarkState { selectedBookmarks: ZBookmark[]; diff --git a/apps/web/lib/clientConfig.tsx b/apps/web/lib/clientConfig.tsx index c5d206e3..ef8e0815 100644 --- a/apps/web/lib/clientConfig.tsx +++ b/apps/web/lib/clientConfig.tsx @@ -1,6 +1,6 @@ import { createContext, useContext } from "react"; -import type { ClientConfig } from "@hoarder/shared/config"; +import type { ClientConfig } from "@karakeep/shared/config"; export const ClientConfigCtx = createContext<ClientConfig>({ demoMode: undefined, diff --git a/apps/web/lib/exportBookmarks.ts b/apps/web/lib/exportBookmarks.ts index f651b897..45db104f 100644 --- a/apps/web/lib/exportBookmarks.ts +++ b/apps/web/lib/exportBookmarks.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import { BookmarkTypes, ZBookmark } from "@hoarder/shared/types/bookmarks"; +import { BookmarkTypes, ZBookmark } from "@karakeep/shared/types/bookmarks"; export const zExportBookmarkSchema = z.object({ createdAt: z.number(), diff --git a/apps/web/lib/hooks/bookmark-search.ts b/apps/web/lib/hooks/bookmark-search.ts index 5ffec1b0..1bccd280 100644 --- a/apps/web/lib/hooks/bookmark-search.ts +++ b/apps/web/lib/hooks/bookmark-search.ts @@ -4,7 +4,7 @@ import { useSortOrderStore } from "@/lib/store/useSortOrderStore"; import { api } from "@/lib/trpc"; import { keepPreviousData } from "@tanstack/react-query"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; function useSearchQuery() { const searchParams = useSearchParams(); diff --git a/apps/web/lib/hooks/upload-file.ts b/apps/web/lib/hooks/upload-file.ts index 42d1cb42..fc8fd524 100644 --- a/apps/web/lib/hooks/upload-file.ts +++ b/apps/web/lib/hooks/upload-file.ts @@ -5,7 +5,7 @@ import { zUploadErrorSchema, ZUploadResponse, zUploadResponseSchema, -} from "@hoarder/shared/types/uploads"; +} from "@karakeep/shared/types/uploads"; export default function useUpload({ onSuccess, diff --git a/apps/web/lib/i18n/settings.ts b/apps/web/lib/i18n/settings.ts index 5787a55e..422941c6 100644 --- a/apps/web/lib/i18n/settings.ts +++ b/apps/web/lib/i18n/settings.ts @@ -1,4 +1,4 @@ -import { supportedLangs } from "@hoarder/shared/langs"; +import { supportedLangs } from "@karakeep/shared/langs"; export const fallbackLng = "en"; export const languages = supportedLangs; diff --git a/apps/web/lib/importBookmarkParser.ts b/apps/web/lib/importBookmarkParser.ts index 0f0797d2..bea92da1 100644 --- a/apps/web/lib/importBookmarkParser.ts +++ b/apps/web/lib/importBookmarkParser.ts @@ -3,7 +3,7 @@ import * as cheerio from "cheerio"; import { parse } from "csv-parse/sync"; import { z } from "zod"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import { zExportSchema } from "./exportBookmarks"; diff --git a/apps/web/lib/providers.tsx b/apps/web/lib/providers.tsx index e1223382..a3debdb9 100644 --- a/apps/web/lib/providers.tsx +++ b/apps/web/lib/providers.tsx @@ -11,7 +11,7 @@ import { httpBatchLink, loggerLink } from "@trpc/client"; import { SessionProvider } from "next-auth/react"; import superjson from "superjson"; -import type { ClientConfig } from "@hoarder/shared/config"; +import type { ClientConfig } from "@karakeep/shared/config"; import { ClientConfigCtx } from "./clientConfig"; import CustomI18nextProvider from "./i18n/provider"; diff --git a/apps/web/lib/store/useSortOrderStore.ts b/apps/web/lib/store/useSortOrderStore.ts index 217e142e..b943713f 100644 --- a/apps/web/lib/store/useSortOrderStore.ts +++ b/apps/web/lib/store/useSortOrderStore.ts @@ -1,6 +1,6 @@ import { create } from "zustand"; -import { ZSortOrder } from "@hoarder/shared/types/bookmarks"; +import { ZSortOrder } from "@karakeep/shared/types/bookmarks"; interface SortOrderState { sortOrder: ZSortOrder; diff --git a/apps/web/lib/trpc.tsx b/apps/web/lib/trpc.tsx index 99fdd8b5..1478684f 100644 --- a/apps/web/lib/trpc.tsx +++ b/apps/web/lib/trpc.tsx @@ -2,6 +2,6 @@ import { createTRPCReact } from "@trpc/react-query"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export const api = createTRPCReact<AppRouter>(); diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs index 7384f0b1..3eadbf91 100644 --- a/apps/web/next.config.mjs +++ b/apps/web/next.config.mjs @@ -50,7 +50,7 @@ const nextConfig = withPWA({ ]; }, - // transpilePackages: ["@hoarder/shared", "@hoarder/db", "@hoarder/trpc"], + // transpilePackages: ["@karakeep/shared", "@karakeep/db", "@karakeep/trpc"], /** We already do linting and typechecking as separate tasks in CI */ eslint: { ignoreDuringBuilds: true }, diff --git a/apps/web/package.json b/apps/web/package.json index 7a54fa2f..db02bbaa 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/web", + "name": "@karakeep/web", "version": "0.1.0", "private": true, "type": "module", @@ -20,11 +20,11 @@ "@auth/drizzle-adapter": "^1.4.2", "@emoji-mart/data": "^1.1.2", "@emoji-mart/react": "^1.1.1", - "@hoarder/db": "workspace:^0.1.0", - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/shared-react": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", "@hookform/resolvers": "^3.3.4", + "@karakeep/db": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", + "@karakeep/shared-react": "workspace:^0.1.0", + "@karakeep/trpc": "workspace:^0.1.0", "@lexical/list": "^0.20.2", "@lexical/markdown": "^0.20.2", "@lexical/plain-text": "^0.20.2", @@ -94,10 +94,10 @@ "zustand": "^4.5.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tailwind-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tailwind-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@types/csv-parse": "^1.2.5", "@types/emoji-mart": "^3.0.14", "@types/react": "^18.2.55", @@ -113,10 +113,10 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/nextjs", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/nextjs", + "@karakeep/eslint-config/react" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/apps/web/server/api/client.ts b/apps/web/server/api/client.ts index 5cf2bbe3..fc223313 100644 --- a/apps/web/server/api/client.ts +++ b/apps/web/server/api/client.ts @@ -2,10 +2,10 @@ import { headers } from "next/headers"; import { getServerAuthSession } from "@/server/auth"; import requestIp from "request-ip"; -import { db } from "@hoarder/db"; -import { Context, createCallerFactory } from "@hoarder/trpc"; -import { authenticateApiKey } from "@hoarder/trpc/auth"; -import { appRouter } from "@hoarder/trpc/routers/_app"; +import { db } from "@karakeep/db"; +import { Context, createCallerFactory } from "@karakeep/trpc"; +import { authenticateApiKey } from "@karakeep/trpc/auth"; +import { appRouter } from "@karakeep/trpc/routers/_app"; export async function createContextFromRequest(req: Request) { // TODO: This is a hack until we offer a proper REST API instead of the trpc based one. diff --git a/apps/web/server/auth.ts b/apps/web/server/auth.ts index 8fa60a75..67621a17 100644 --- a/apps/web/server/auth.ts +++ b/apps/web/server/auth.ts @@ -10,15 +10,15 @@ import CredentialsProvider from "next-auth/providers/credentials"; import { Provider } from "next-auth/providers/index"; import requestIp from "request-ip"; -import { db } from "@hoarder/db"; +import { db } from "@karakeep/db"; import { accounts, sessions, users, verificationTokens, -} from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; -import { logAuthenticationError, validatePassword } from "@hoarder/trpc/auth"; +} from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; +import { logAuthenticationError, validatePassword } from "@karakeep/trpc/auth"; type UserRole = "admin" | "user"; diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts index 1c042f0e..44bb114c 100644 --- a/apps/web/tailwind.config.ts +++ b/apps/web/tailwind.config.ts @@ -1,6 +1,6 @@ import type { Config } from "tailwindcss"; -import web from "@hoarder/tailwind-config/web"; +import web from "@karakeep/tailwind-config/web"; const config = { content: web.content, diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index f7a25fc6..fb5492e4 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "baseUrl": ".", "plugins": [ diff --git a/apps/workers/assetPreprocessingWorker.ts b/apps/workers/assetPreprocessingWorker.ts index c0fb2665..a678b706 100644 --- a/apps/workers/assetPreprocessingWorker.ts +++ b/apps/workers/assetPreprocessingWorker.ts @@ -5,22 +5,22 @@ import PDFParser from "pdf2json"; import { fromBuffer } from "pdf2pic"; import { createWorker } from "tesseract.js"; -import type { AssetPreprocessingRequest } from "@hoarder/shared/queues"; -import { db } from "@hoarder/db"; +import type { AssetPreprocessingRequest } from "@karakeep/shared/queues"; +import { db } from "@karakeep/db"; import { assets, AssetTypes, bookmarkAssets, bookmarks, -} from "@hoarder/db/schema"; -import { newAssetId, readAsset, saveAsset } from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; -import logger from "@hoarder/shared/logger"; +} from "@karakeep/db/schema"; +import { newAssetId, readAsset, saveAsset } from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; +import logger from "@karakeep/shared/logger"; import { AssetPreprocessingQueue, OpenAIQueue, triggerSearchReindex, -} from "@hoarder/shared/queues"; +} from "@karakeep/shared/queues"; export class AssetPreprocessingWorker { static build() { diff --git a/apps/workers/crawlerWorker.ts b/apps/workers/crawlerWorker.ts index e75a8586..c96ca636 100644 --- a/apps/workers/crawlerWorker.ts +++ b/apps/workers/crawlerWorker.ts @@ -30,15 +30,15 @@ import StealthPlugin from "puppeteer-extra-plugin-stealth"; import { withTimeout } from "utils"; import { getBookmarkDetails, updateAsset } from "workerUtils"; -import type { ZCrawlLinkRequest } from "@hoarder/shared/queues"; -import { db } from "@hoarder/db"; +import type { ZCrawlLinkRequest } from "@karakeep/shared/queues"; +import { db } from "@karakeep/db"; import { assets, AssetTypes, bookmarkAssets, bookmarkLinks, bookmarks, -} from "@hoarder/db/schema"; +} from "@karakeep/db/schema"; import { ASSET_TYPES, getAssetSize, @@ -49,9 +49,9 @@ import { saveAssetFromFile, silentDeleteAsset, SUPPORTED_UPLOAD_ASSET_TYPES, -} from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; -import logger from "@hoarder/shared/logger"; +} from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; +import logger from "@karakeep/shared/logger"; import { AssetPreprocessingQueue, LinkCrawlerQueue, @@ -60,8 +60,8 @@ import { triggerVideoWorker, triggerWebhook, zCrawlLinkRequestSchema, -} from "@hoarder/shared/queues"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/queues"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; const metascraperParser = metascraper([ metascraperDate({ diff --git a/apps/workers/exit.ts b/apps/workers/exit.ts index 29bfa5ef..cd50a323 100644 --- a/apps/workers/exit.ts +++ b/apps/workers/exit.ts @@ -1,4 +1,4 @@ -import logger from "@hoarder/shared/logger"; +import logger from "@karakeep/shared/logger"; export let isShuttingDown = false; diff --git a/apps/workers/feedWorker.ts b/apps/workers/feedWorker.ts index 9d5c110b..e393025a 100644 --- a/apps/workers/feedWorker.ts +++ b/apps/workers/feedWorker.ts @@ -5,12 +5,12 @@ import Parser from "rss-parser"; import { buildImpersonatingTRPCClient } from "trpc"; import { z } from "zod"; -import type { ZFeedRequestSchema } from "@hoarder/shared/queues"; -import { db } from "@hoarder/db"; -import { rssFeedImportsTable, rssFeedsTable } from "@hoarder/db/schema"; -import logger from "@hoarder/shared/logger"; -import { FeedQueue } from "@hoarder/shared/queues"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import type { ZFeedRequestSchema } from "@karakeep/shared/queues"; +import { db } from "@karakeep/db"; +import { rssFeedImportsTable, rssFeedsTable } from "@karakeep/db/schema"; +import logger from "@karakeep/shared/logger"; +import { FeedQueue } from "@karakeep/shared/queues"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; export const FeedRefreshingWorker = cron.schedule( "0 * * * *", diff --git a/apps/workers/index.ts b/apps/workers/index.ts index 3997b423..207c7f64 100644 --- a/apps/workers/index.ts +++ b/apps/workers/index.ts @@ -4,9 +4,9 @@ import { AssetPreprocessingWorker } from "assetPreprocessingWorker"; import { FeedRefreshingWorker, FeedWorker } from "feedWorker"; import { TidyAssetsWorker } from "tidyAssetsWorker"; -import serverConfig from "@hoarder/shared/config"; -import logger from "@hoarder/shared/logger"; -import { runQueueDBMigrations } from "@hoarder/shared/queues"; +import serverConfig from "@karakeep/shared/config"; +import logger from "@karakeep/shared/logger"; +import { runQueueDBMigrations } from "@karakeep/shared/queues"; import { CrawlerWorker } from "./crawlerWorker"; import { shutdownPromise } from "./exit"; diff --git a/apps/workers/openaiWorker.ts b/apps/workers/openaiWorker.ts index 64e36b82..7b0ae095 100644 --- a/apps/workers/openaiWorker.ts +++ b/apps/workers/openaiWorker.ts @@ -3,26 +3,26 @@ import { DequeuedJob, Runner } from "liteque"; import { buildImpersonatingTRPCClient } from "trpc"; import { z } from "zod"; -import type { InferenceClient } from "@hoarder/shared/inference"; -import type { ZOpenAIRequest } from "@hoarder/shared/queues"; -import { db } from "@hoarder/db"; +import type { InferenceClient } from "@karakeep/shared/inference"; +import type { ZOpenAIRequest } from "@karakeep/shared/queues"; +import { db } from "@karakeep/db"; import { bookmarks, bookmarkTags, customPrompts, tagsOnBookmarks, -} from "@hoarder/db/schema"; -import { readAsset } from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; -import { InferenceClientFactory } from "@hoarder/shared/inference"; -import logger from "@hoarder/shared/logger"; -import { buildImagePrompt, buildTextPrompt } from "@hoarder/shared/prompts"; +} from "@karakeep/db/schema"; +import { readAsset } from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; +import { InferenceClientFactory } from "@karakeep/shared/inference"; +import logger from "@karakeep/shared/logger"; +import { buildImagePrompt, buildTextPrompt } from "@karakeep/shared/prompts"; import { OpenAIQueue, triggerSearchReindex, triggerWebhook, zOpenAIRequestSchema, -} from "@hoarder/shared/queues"; +} from "@karakeep/shared/queues"; const openAIResponseSchema = z.object({ tags: z.array(z.string()), diff --git a/apps/workers/package.json b/apps/workers/package.json index 86d781aa..7ce1cbcf 100644 --- a/apps/workers/package.json +++ b/apps/workers/package.json @@ -1,14 +1,14 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/workers", + "name": "@karakeep/workers", "version": "0.1.0", "private": true, "dependencies": { "@ghostery/adblocker-puppeteer": "^2.1.1", - "@hoarder/db": "workspace:^0.1.0", - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/db": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", + "@karakeep/trpc": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@mozilla/readability": "^0.5.0", "@tsconfig/node22": "^22.0.0", "async-mutex": "^0.4.1", @@ -46,8 +46,8 @@ "zod": "^3.22.4" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", "@types/jsdom": "^21.1.6", "@types/metascraper": "^5.14.3", "@types/node-cron": "^3.0.11" @@ -64,8 +64,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/apps/workers/searchWorker.ts b/apps/workers/searchWorker.ts index 7ad8b430..e7b827a9 100644 --- a/apps/workers/searchWorker.ts +++ b/apps/workers/searchWorker.ts @@ -1,15 +1,15 @@ import { eq } from "drizzle-orm"; import { DequeuedJob, Runner } from "liteque"; -import type { ZSearchIndexingRequest } from "@hoarder/shared/queues"; -import { db } from "@hoarder/db"; -import { bookmarks } from "@hoarder/db/schema"; -import logger from "@hoarder/shared/logger"; +import type { ZSearchIndexingRequest } from "@karakeep/shared/queues"; +import { db } from "@karakeep/db"; +import { bookmarks } from "@karakeep/db/schema"; +import logger from "@karakeep/shared/logger"; import { SearchIndexingQueue, zSearchIndexingRequestSchema, -} from "@hoarder/shared/queues"; -import { getSearchIdxClient } from "@hoarder/shared/search"; +} from "@karakeep/shared/queues"; +import { getSearchIdxClient } from "@karakeep/shared/search"; export class SearchIndexingWorker { static build() { diff --git a/apps/workers/tidyAssetsWorker.ts b/apps/workers/tidyAssetsWorker.ts index bea0b7d9..d4c8abdb 100644 --- a/apps/workers/tidyAssetsWorker.ts +++ b/apps/workers/tidyAssetsWorker.ts @@ -1,15 +1,15 @@ import { eq } from "drizzle-orm"; import { DequeuedJob, Runner } from "liteque"; -import { db } from "@hoarder/db"; -import { assets } from "@hoarder/db/schema"; -import { deleteAsset, getAllAssets } from "@hoarder/shared/assetdb"; -import logger from "@hoarder/shared/logger"; +import { db } from "@karakeep/db"; +import { assets } from "@karakeep/db/schema"; +import { deleteAsset, getAllAssets } from "@karakeep/shared/assetdb"; +import logger from "@karakeep/shared/logger"; import { TidyAssetsQueue, ZTidyAssetsRequest, zTidyAssetsRequestSchema, -} from "@hoarder/shared/queues"; +} from "@karakeep/shared/queues"; export class TidyAssetsWorker { static build() { diff --git a/apps/workers/trpc.ts b/apps/workers/trpc.ts index cd2e4c99..8bae287a 100644 --- a/apps/workers/trpc.ts +++ b/apps/workers/trpc.ts @@ -1,9 +1,9 @@ import { eq } from "drizzle-orm"; -import { db } from "@hoarder/db"; -import { users } from "@hoarder/db/schema"; -import { createCallerFactory } from "@hoarder/trpc"; -import { appRouter } from "@hoarder/trpc/routers/_app"; +import { db } from "@karakeep/db"; +import { users } from "@karakeep/db/schema"; +import { createCallerFactory } from "@karakeep/trpc"; +import { appRouter } from "@karakeep/trpc/routers/_app"; /** * This is only safe to use in the context of a worker. diff --git a/apps/workers/tsconfig.json b/apps/workers/tsconfig.json index 24b9a10d..58326836 100644 --- a/apps/workers/tsconfig.json +++ b/apps/workers/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/apps/workers/videoWorker.ts b/apps/workers/videoWorker.ts index 23ead8f8..b8f85ddf 100644 --- a/apps/workers/videoWorker.ts +++ b/apps/workers/videoWorker.ts @@ -4,22 +4,22 @@ import path from "path"; import { execa } from "execa";
import { DequeuedJob, Runner } from "liteque";
-import { db } from "@hoarder/db";
-import { AssetTypes } from "@hoarder/db/schema";
+import { db } from "@karakeep/db";
+import { AssetTypes } from "@karakeep/db/schema";
import {
ASSET_TYPES,
getAssetSize,
newAssetId,
saveAssetFromFile,
silentDeleteAsset,
-} from "@hoarder/shared/assetdb";
-import serverConfig from "@hoarder/shared/config";
-import logger from "@hoarder/shared/logger";
+} from "@karakeep/shared/assetdb";
+import serverConfig from "@karakeep/shared/config";
+import logger from "@karakeep/shared/logger";
import {
VideoWorkerQueue,
ZVideoRequest,
zvideoRequestSchema,
-} from "@hoarder/shared/queues";
+} from "@karakeep/shared/queues";
import { withTimeout } from "./utils";
import { getBookmarkDetails, updateAsset } from "./workerUtils";
diff --git a/apps/workers/webhookWorker.ts b/apps/workers/webhookWorker.ts index 820d3b87..fb8227e3 100644 --- a/apps/workers/webhookWorker.ts +++ b/apps/workers/webhookWorker.ts @@ -2,15 +2,15 @@ import { eq } from "drizzle-orm"; import { DequeuedJob, Runner } from "liteque"; import fetch from "node-fetch"; -import { db } from "@hoarder/db"; -import { bookmarks } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; -import logger from "@hoarder/shared/logger"; +import { db } from "@karakeep/db"; +import { bookmarks } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; +import logger from "@karakeep/shared/logger"; import { WebhookQueue, ZWebhookRequest, zWebhookRequestSchema, -} from "@hoarder/shared/queues"; +} from "@karakeep/shared/queues"; export class WebhookWorker { static build() { diff --git a/apps/workers/workerUtils.ts b/apps/workers/workerUtils.ts index 2b365c73..59a5a780 100644 --- a/apps/workers/workerUtils.ts +++ b/apps/workers/workerUtils.ts @@ -1,7 +1,7 @@ import { eq } from "drizzle-orm";
-import { db, HoarderDBTransaction } from "@hoarder/db";
-import { assets, AssetTypes, bookmarks } from "@hoarder/db/schema";
+import { db, HoarderDBTransaction } from "@karakeep/db";
+import { assets, AssetTypes, bookmarks } from "@karakeep/db/schema";
type DBAssetType = typeof assets.$inferInsert;
diff --git a/docker/Dockerfile b/docker/Dockerfile index f836a9e2..91d84b36 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" -# https://github.com/hoarder-app/hoarder/issues/967 +# https://github.com/karakeep-app/karakeep/issues/967 RUN npm install -g corepack@0.31.0 && corepack enable # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. @@ -26,7 +26,7 @@ RUN cd packages/db && \ RUN (cd apps/web && pnpm exec next build --experimental-build-mode compile) # Build the worker code -RUN pnpm deploy --node-linker=isolated --filter @hoarder/workers --prod /prod/workers +RUN pnpm deploy --node-linker=isolated --filter @karakeep/workers --prod /prod/workers # Build the cli RUN (cd apps/cli && pnpm build) @@ -37,7 +37,7 @@ FROM node:22-alpine AS aio_builder LABEL org.opencontainers.image.source="https://github.com/karakeep-app/karakeep" WORKDIR /app -# https://github.com/hoarder-app/hoarder/issues/967 +# https://github.com/karakeep-app/karakeep/issues/967 RUN npm install -g corepack@0.31.0 ARG SERVER_VERSION=nightly diff --git a/docs/docs/07-Development/01-setup.md b/docs/docs/07-Development/01-setup.md index 41e0a902..8e139999 100644 --- a/docs/docs/07-Development/01-setup.md +++ b/docs/docs/07-Development/01-setup.md @@ -2,7 +2,7 @@ ## Manual Setup -Hoarder uses `node` version 22. To install it, you can use `nvm` [^1] +Karakeep uses `node` version 22. To install it, you can use `nvm` [^1] ``` $ nvm install 22 @@ -14,7 +14,7 @@ $ node --version v22.14.0 ``` -Hoarder also makes use of `corepack`[^2]. If you have `node` installed, then `corepack` should already be +Karakeep also makes use of `corepack`[^2]. If you have `node` installed, then `corepack` should already be installed on your machine, and you don't need to do anything. To verify the `corepack` is installed run: ``` @@ -44,7 +44,7 @@ Packages: +3129 Progress: resolved 0, reused 2699, downloaded 0, added 3129, done devDependencies: -+ @hoarder/prettier-config 0.1.0 <- tooling/prettier ++ @karakeep/prettier-config 0.1.0 <- tooling/prettier . prepare$ husky └─ Done in 45ms diff --git a/docs/docs/09-command-line.md b/docs/docs/09-command-line.md index 5d404914..a7b7fc87 100644 --- a/docs/docs/09-command-line.md +++ b/docs/docs/09-command-line.md @@ -1,6 +1,6 @@ # Command Line Tool (CLI) -Hoarder comes with a simple CLI for those users who want to do more advanced manipulation. +Karakeep comes with a simple CLI for those users who want to do more advanced manipulation. ## Features @@ -10,30 +10,30 @@ Hoarder comes with a simple CLI for those users who want to do more advanced man ## Installation (NPM) ``` -npm install -g @hoarderapp/cli +npm install -g @karakeep/cli ``` ## Installation (Docker) ``` -docker run --rm ghcr.io/hoarder-app/hoarder-cli:release --help +docker run --rm ghcr.io/karakeep-app/karakeep-cli:release --help ``` ## Usage ``` -hoarder +karakeep ``` ``` -Usage: hoarder [options] [command] +Usage: karakeep [options] [command] -A CLI interface to interact with the hoarder api +A CLI interface to interact with the karakeep api Options: - --api-key <key> the API key to interact with the API (env: HOARDER_API_KEY) - --server-addr <addr> the address of the server to connect to (env: HOARDER_SERVER_ADDR) + --api-key <key> the API key to interact with the API (env: KARAKEEP_API_KEY) + --server-addr <addr> the address of the server to connect to (env: KARAKEEP_SERVER_ADDR) -V, --version output the version number -h, --help display help for command @@ -48,11 +48,11 @@ Commands: And some of the subcommands: ``` -hoarder bookmarks +karakeep bookmarks ``` ``` -Usage: hoarder bookmarks [options] [command] +Usage: karakeep bookmarks [options] [command] Manipulating bookmarks @@ -70,11 +70,11 @@ Commands: ``` ``` -hoarder lists +karakeep lists ``` ``` -Usage: hoarder lists [options] [command] +Usage: karakeep lists [options] [command] Manipulating lists @@ -91,16 +91,16 @@ Commands: ## Optaining an API Key -To use the CLI, you'll need to get an API key from your hoarder settings. You can validate that it's working by running: +To use the CLI, you'll need to get an API key from your karakeep settings. You can validate that it's working by running: ``` -hoarder --api-key <key> --server-addr <addr> whoami +karakeep --api-key <key> --server-addr <addr> whoami ``` For example: ``` -hoarder --api-key mysupersecretkey --server-addr https://try.hoarder.app whoami +karakeep --api-key mysupersecretkey --server-addr https://try.karakeep.app whoami { id: 'j29gnbzxxd01q74j2lu88tnb', name: 'Test User', diff --git a/docs/package.json b/docs/package.json index 3ea4caf8..57371882 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,5 +1,5 @@ { - "name": "@hoarder/docs", + "name": "@karakeep/docs", "version": "0.0.0", "private": true, "scripts": { @@ -46,12 +46,12 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/nextjs", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/nextjs", + "@karakeep/eslint-config/react" ] }, - "prettier": "@hoarder/prettier-config", + "prettier": "@karakeep/prettier-config", "engines": { "node": ">=18.0" } diff --git a/package.json b/package.json index 04b88023..5790ac02 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,10 @@ "dev": "turbo --no-daemon dev --parallel", "clean": "git clean -xdf node_modules", "clean:workspaces": "turbo --no-daemon clean", - "db:migrate": "pnpm --filter @hoarder/db run migrate", - "db:studio": "pnpm --filter @hoarder/db studio", - "workers": "pnpm --filter @hoarder/workers run start", - "web": "pnpm --filter @hoarder/web run dev", + "db:migrate": "pnpm --filter @karakeep/db run migrate", + "db:studio": "pnpm --filter @karakeep/db studio", + "workers": "pnpm --filter @karakeep/workers run start", + "web": "pnpm --filter @karakeep/web run dev", "prepare": "husky", "format": "turbo --no-daemon format --continue -- --cache-location node_modules/.cache/.prettiercache", "format:fix": "turbo --no-daemon format --continue -- --write --cache-location node_modules/.cache/.prettiercache", @@ -20,7 +20,7 @@ "typecheck": "turbo --no-daemon typecheck" }, "devDependencies": { - "@hoarder/prettier-config": "workspace:^0.1.0", + "@karakeep/prettier-config": "workspace:^0.1.0", "@tanstack/eslint-plugin-query": "^5.20.1", "@types/node": "^22", "es-errors": "^1.3.0", @@ -31,7 +31,7 @@ "sherif": "^1.2.0", "turbo": "^2.1.2" }, - "prettier": "@hoarder/prettier-config", + "prettier": "@karakeep/prettier-config", "packageManager": "pnpm@9.0.0-alpha.8+sha256.a433a59569b00389a951352956faf25d1fdf43b568213fbde591c36274d4bc30", "pnpm": { "patchedDependencies": { diff --git a/packages/db/drizzle.config.ts b/packages/db/drizzle.config.ts index dca30914..f7e57e83 100644 --- a/packages/db/drizzle.config.ts +++ b/packages/db/drizzle.config.ts @@ -1,6 +1,6 @@ import "dotenv/config"; import type { Config } from "drizzle-kit"; -import serverConfig from "@hoarder/shared/config"; +import serverConfig from "@karakeep/shared/config"; const databaseURL = serverConfig.dataDir ? `${serverConfig.dataDir}/db.db` diff --git a/packages/db/package.json b/packages/db/package.json index 071fc153..74f4f84f 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/db", + "name": "@karakeep/db", "version": "0.1.0", "private": true, "main": "index.ts", @@ -11,7 +11,7 @@ }, "dependencies": { "@auth/core": "^0.27.0", - "@hoarder/shared": "workspace:*", + "@karakeep/shared": "workspace:*", "@paralleldrive/cuid2": "^2.2.2", "better-sqlite3": "^11.3.0", "dotenv": "^16.4.1", @@ -19,9 +19,9 @@ "tsx": "^4.7.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@tsconfig/node22": "^22.0.0", "@types/better-sqlite3": "^7.6.11", "drizzle-kit": "^0.30.01" @@ -29,8 +29,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/db/schema.ts b/packages/db/schema.ts index 7dab7401..d08f0698 100644 --- a/packages/db/schema.ts +++ b/packages/db/schema.ts @@ -11,7 +11,7 @@ import { unique, } from "drizzle-orm/sqlite-core"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; function createdAtField() { return integer("createdAt", { mode: "timestamp" }) diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json index 59982ea1..4b2dbfe9 100644 --- a/packages/db/tsconfig.json +++ b/packages/db/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/e2e_tests/package.json b/packages/e2e_tests/package.json index 2dc05574..9245d366 100644 --- a/packages/e2e_tests/package.json +++ b/packages/e2e_tests/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/e2e_tests", + "name": "@karakeep/e2e_tests", "version": "0.1.0", "private": true, "type": "module", @@ -14,22 +14,22 @@ "test:watch": "vitest" }, "dependencies": { - "@hoarder/trpc": "workspace:^0.1.0", - "@hoarderapp/sdk": "workspace:*", + "@karakeep/sdk": "workspace:*", + "@karakeep/trpc": "workspace:^0.1.0", "superjson": "^2.2.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" }, "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/e2e_tests/tests/api/assets.test.ts b/packages/e2e_tests/tests/api/assets.test.ts index 0ed10dee..8de3c411 100644 --- a/packages/e2e_tests/tests/api/assets.test.ts +++ b/packages/e2e_tests/tests/api/assets.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { assert, beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser, uploadTestAsset } from "../../utils/api"; describe("Assets API", () => { diff --git a/packages/e2e_tests/tests/api/bookmarks.test.ts b/packages/e2e_tests/tests/api/bookmarks.test.ts index df3cefe2..dbd536b1 100644 --- a/packages/e2e_tests/tests/api/bookmarks.test.ts +++ b/packages/e2e_tests/tests/api/bookmarks.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { assert, beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Bookmarks API", () => { diff --git a/packages/e2e_tests/tests/api/highlights.test.ts b/packages/e2e_tests/tests/api/highlights.test.ts index 94a4d28b..1523dc91 100644 --- a/packages/e2e_tests/tests/api/highlights.test.ts +++ b/packages/e2e_tests/tests/api/highlights.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Highlights API", () => { diff --git a/packages/e2e_tests/tests/api/lists.test.ts b/packages/e2e_tests/tests/api/lists.test.ts index 657d8535..2d6ab98c 100644 --- a/packages/e2e_tests/tests/api/lists.test.ts +++ b/packages/e2e_tests/tests/api/lists.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Lists API", () => { diff --git a/packages/e2e_tests/tests/api/tags.test.ts b/packages/e2e_tests/tests/api/tags.test.ts index dfd3f14b..3355bc1e 100644 --- a/packages/e2e_tests/tests/api/tags.test.ts +++ b/packages/e2e_tests/tests/api/tags.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Tags API", () => { diff --git a/packages/e2e_tests/tests/api/users.test.ts b/packages/e2e_tests/tests/api/users.test.ts index 36c0868d..7fe43894 100644 --- a/packages/e2e_tests/tests/api/users.test.ts +++ b/packages/e2e_tests/tests/api/users.test.ts @@ -1,6 +1,7 @@ -import { createHoarderClient } from "@hoarderapp/sdk"; import { beforeEach, describe, expect, inject, it } from "vitest"; +import { createHoarderClient } from "@karakeep/sdk"; + import { createTestUser } from "../../utils/api"; describe("Users API", () => { diff --git a/packages/e2e_tests/tsconfig.json b/packages/e2e_tests/tsconfig.json index dbd0afdc..a795b96a 100644 --- a/packages/e2e_tests/tsconfig.json +++ b/packages/e2e_tests/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/e2e_tests/utils/trpc.ts b/packages/e2e_tests/utils/trpc.ts index 7d916d93..a13e0a83 100644 --- a/packages/e2e_tests/utils/trpc.ts +++ b/packages/e2e_tests/utils/trpc.ts @@ -1,7 +1,7 @@ import { createTRPCClient, httpBatchLink } from "@trpc/client"; import superjson from "superjson"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export function getTrpcClient(apiKey?: string) { return createTRPCClient<AppRouter>({ diff --git a/packages/open-api/lib/bookmarks.ts b/packages/open-api/lib/bookmarks.ts index a1ab1353..b45d6350 100644 --- a/packages/open-api/lib/bookmarks.ts +++ b/packages/open-api/lib/bookmarks.ts @@ -10,7 +10,7 @@ import { zManipulatedTagSchema, zNewBookmarkRequestSchema, zUpdateBookmarksRequestSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { BearerAuth } from "./common"; import { HighlightSchema } from "./highlights"; diff --git a/packages/open-api/lib/highlights.ts b/packages/open-api/lib/highlights.ts index fc4c2aed..2e4ec2d1 100644 --- a/packages/open-api/lib/highlights.ts +++ b/packages/open-api/lib/highlights.ts @@ -8,7 +8,7 @@ import { zHighlightSchema, zNewHighlightSchema, zUpdateHighlightSchema, -} from "@hoarder/shared/types/highlights"; +} from "@karakeep/shared/types/highlights"; import { BearerAuth } from "./common"; import { PaginationSchema } from "./pagination"; diff --git a/packages/open-api/lib/lists.ts b/packages/open-api/lib/lists.ts index 4b728a1e..c66acef4 100644 --- a/packages/open-api/lib/lists.ts +++ b/packages/open-api/lib/lists.ts @@ -8,7 +8,7 @@ import { zBookmarkListSchema, zEditBookmarkListSchema, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import { BookmarkIdSchema } from "./bookmarks"; import { BearerAuth } from "./common"; diff --git a/packages/open-api/lib/pagination.ts b/packages/open-api/lib/pagination.ts index fe98cd62..dfe835e2 100644 --- a/packages/open-api/lib/pagination.ts +++ b/packages/open-api/lib/pagination.ts @@ -1,7 +1,7 @@ import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi"; import { z } from "zod"; -import { zBookmarkSchema } from "@hoarder/shared/types/bookmarks"; +import { zBookmarkSchema } from "@karakeep/shared/types/bookmarks"; extendZodWithOpenApi(z); diff --git a/packages/open-api/lib/tags.ts b/packages/open-api/lib/tags.ts index 10e49d82..e7e6561d 100644 --- a/packages/open-api/lib/tags.ts +++ b/packages/open-api/lib/tags.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { zGetTagResponseSchema, zUpdateTagRequestSchema, -} from "@hoarder/shared/types/tags"; +} from "@karakeep/shared/types/tags"; import { BearerAuth } from "./common"; import { PaginatedBookmarksSchema, PaginationSchema } from "./pagination"; diff --git a/packages/open-api/lib/users.ts b/packages/open-api/lib/users.ts index 657fcdc8..fa512a80 100644 --- a/packages/open-api/lib/users.ts +++ b/packages/open-api/lib/users.ts @@ -7,7 +7,7 @@ import { z } from "zod"; import { zUserStatsResponseSchema, zWhoAmIResponseSchema, -} from "@hoarder/shared/types/users"; +} from "@karakeep/shared/types/users"; import { BearerAuth } from "./common"; diff --git a/packages/open-api/package.json b/packages/open-api/package.json index 2d478018..0059f9bf 100644 --- a/packages/open-api/package.json +++ b/packages/open-api/package.json @@ -1,18 +1,18 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/open-api", + "name": "@karakeep/open-api", "version": "0.1.0", "private": true, "type": "module", "dependencies": { "@asteasolutions/zod-to-openapi": "^7.2.0", - "@hoarder/shared": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", "zod": "^3.22.4" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "tsx": "^4.7.1" }, "scripts": { @@ -25,8 +25,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/open-api/tsconfig.json b/packages/open-api/tsconfig.json index 71bf61e7..d97c8ef4 100644 --- a/packages/open-api/tsconfig.json +++ b/packages/open-api/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/sdk/README.md b/packages/sdk/README.md index 5aad1847..1bfc10ac 100644 --- a/packages/sdk/README.md +++ b/packages/sdk/README.md @@ -1,21 +1,21 @@ -# Hoarder SDK +# Karakeep SDK -This package contains the official typescript SDK for the hoarder API. +This package contains the official typescript SDK for the karakeep API. ## Installation ``` -npm install @hoarderapp/sdk +npm install @karakeep/sdk ``` ## Usage ```typescript -import { createHoarderClient } from "@hoarderapp/sdk"; +import { createHoarderClient } from "@karakeep/sdk"; // Create a client const apiKey = "my-super-secret-key"; -const addr = `https://hoarder.mydomain.com`; +const addr = `https://karakeep.mydomain.com`; const client = createHoarderClient({ baseUrl: `${addr}/api/v1/`, headers: { @@ -56,9 +56,9 @@ console.log(searchResponse.status, searchResults, searchError); ## Docs -API docs can be found [here](https://docs.hoarder.app/api). +API docs can be found [here](https://docs.karakeep.app/api). ## Versioning -- This package follows the minor version of the hoarder server. So new APIs introduced in Hoarder version `0.21.0` will be available in this package starting from version `0.21.0`. -- Hoarder strives to maintain backward compatibility in its APIs, so older versions of this package should continue working with newer hoarder server versions. +- This package follows the minor version of the karakeep server. So new APIs introduced in Karakeep version `0.21.0` will be available in this package starting from version `0.21.0`. +- Karakeep strives to maintain backward compatibility in its APIs, so older versions of this package should continue working with newer karakeep server versions. diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 50ffe075..51408f79 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,8 +1,8 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarderapp/sdk", - "version": "0.23.0", - "description": "Typescript SDK for Hoarder", + "name": "@karakeep/sdk", + "version": "0.23.2", + "description": "Typescript SDK for Karakeep", "license": "GNU Affero General Public License version 3", "keywords": [ "hoarder", @@ -17,9 +17,9 @@ "types": "./dist/index.d.ts" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@tsconfig/node22": "^22.0.0", "tsx": "^4.7.1", "vite": "^5.1.0", @@ -36,19 +36,19 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/hoarder-app/hoarder.git", + "url": "git+https://github.com/karakeep-app/karakeep.git", "directory": "packages/sdk" }, "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ], "ignorePatterns": [ "src/hoarder-api.d.ts" ] }, - "prettier": "@hoarder/prettier-config", + "prettier": "@karakeep/prettier-config", "dependencies": { "openapi-fetch": "^0.13.3" } diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json index bf344404..07b074a3 100644 --- a/packages/sdk/tsconfig.json +++ b/packages/sdk/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["src", "vite.config.mts"], "exclude": ["node_modules", "dist"], "compilerOptions": { diff --git a/packages/shared-react/hooks/bookmark-grid-context.tsx b/packages/shared-react/hooks/bookmark-grid-context.tsx index 7d71d28c..190ccd56 100644 --- a/packages/shared-react/hooks/bookmark-grid-context.tsx +++ b/packages/shared-react/hooks/bookmark-grid-context.tsx @@ -2,7 +2,7 @@ import { createContext, useContext } from "react"; -import type { ZGetBookmarksRequest } from "@hoarder/shared/types/bookmarks"; +import type { ZGetBookmarksRequest } from "@karakeep/shared/types/bookmarks"; export const BookmarkGridContext = createContext< ZGetBookmarksRequest | undefined diff --git a/packages/shared-react/hooks/bookmark-list-context.tsx b/packages/shared-react/hooks/bookmark-list-context.tsx index d00e0567..3eb3a6ad 100644 --- a/packages/shared-react/hooks/bookmark-list-context.tsx +++ b/packages/shared-react/hooks/bookmark-list-context.tsx @@ -2,7 +2,7 @@ import { createContext, useContext } from "react"; -import { ZBookmarkList } from "@hoarder/shared/types/lists"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; export const BookmarkListContext = createContext<ZBookmarkList | undefined>( undefined, diff --git a/packages/shared-react/hooks/lists.ts b/packages/shared-react/hooks/lists.ts index ecb5d408..4dd9bc2b 100644 --- a/packages/shared-react/hooks/lists.ts +++ b/packages/shared-react/hooks/lists.ts @@ -1,8 +1,8 @@ -import { ZBookmarkList } from "@hoarder/shared/types/lists"; +import { ZBookmarkList } from "@karakeep/shared/types/lists"; import { listsToTree, ZBookmarkListRoot, -} from "@hoarder/shared/utils/listUtils"; +} from "@karakeep/shared/utils/listUtils"; import { api } from "../trpc"; diff --git a/packages/shared-react/package.json b/packages/shared-react/package.json index 5678274a..8d0d6f64 100644 --- a/packages/shared-react/package.json +++ b/packages/shared-react/package.json @@ -1,19 +1,19 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/shared-react", + "name": "@karakeep/shared-react", "version": "0.1.0", "private": true, "dependencies": { - "@hoarder/shared": "workspace:^0.1.0", - "@hoarder/trpc": "workspace:^0.1.0", + "@karakeep/shared": "workspace:^0.1.0", + "@karakeep/trpc": "workspace:^0.1.0", "@tanstack/react-query": "^5.67.1", "@trpc/client": "11.0.0", "superjson": "^2.2.1" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0" + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0" }, "peerDependencies": { "react": "^18.3.1", @@ -32,9 +32,9 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base", - "@hoarder/eslint-config/react" + "@karakeep/eslint-config/base", + "@karakeep/eslint-config/react" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/shared-react/trpc.ts b/packages/shared-react/trpc.ts index 99fdd8b5..1478684f 100644 --- a/packages/shared-react/trpc.ts +++ b/packages/shared-react/trpc.ts @@ -2,6 +2,6 @@ import { createTRPCReact } from "@trpc/react-query"; -import type { AppRouter } from "@hoarder/trpc/routers/_app"; +import type { AppRouter } from "@karakeep/trpc/routers/_app"; export const api = createTRPCReact<AppRouter>(); diff --git a/packages/shared-react/tsconfig.json b/packages/shared-react/tsconfig.json index 8c3411bf..3d6919d0 100644 --- a/packages/shared-react/tsconfig.json +++ b/packages/shared-react/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "baseUrl": ".", "plugins": [], diff --git a/packages/shared-react/utils/bookmarkUtils.ts b/packages/shared-react/utils/bookmarkUtils.ts index fc0fd97d..1f840f78 100644 --- a/packages/shared-react/utils/bookmarkUtils.ts +++ b/packages/shared-react/utils/bookmarkUtils.ts @@ -2,7 +2,7 @@ import { BookmarkTypes, ZBookmark, ZBookmarkedLink, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { getAssetUrl } from "./assetUtils"; diff --git a/packages/shared/package.json b/packages/shared/package.json index d99de69d..14815c86 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/shared", + "name": "@karakeep/shared", "version": "0.1.0", "private": true, "type": "module", @@ -16,9 +16,9 @@ "zod-to-json-schema": "^3.24.3" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "vitest": "^1.6.1" }, "scripts": { @@ -33,8 +33,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index 71bf61e7..d97c8ef4 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/packages/trpc/auth.ts b/packages/trpc/auth.ts index 1efbdde6..f5ce88e5 100644 --- a/packages/trpc/auth.ts +++ b/packages/trpc/auth.ts @@ -1,10 +1,10 @@ import { randomBytes } from "crypto"; import * as bcrypt from "bcryptjs"; -import { db } from "@hoarder/db"; -import { apiKeys } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; -import { authFailureLogger } from "@hoarder/shared/logger"; +import { db } from "@karakeep/db"; +import { apiKeys } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; +import { authFailureLogger } from "@karakeep/shared/logger"; // API Keys diff --git a/packages/trpc/index.ts b/packages/trpc/index.ts index 26d8ea96..e34e56eb 100644 --- a/packages/trpc/index.ts +++ b/packages/trpc/index.ts @@ -2,8 +2,8 @@ import { initTRPC, TRPCError } from "@trpc/server"; import superjson from "superjson"; import { ZodError } from "zod"; -import type { db } from "@hoarder/db"; -import serverConfig from "@hoarder/shared/config"; +import type { db } from "@karakeep/db"; +import serverConfig from "@karakeep/shared/config"; interface User { id: string; diff --git a/packages/trpc/lib/__tests__/search.test.ts b/packages/trpc/lib/__tests__/search.test.ts index 9f8aac88..9d9b39d7 100644 --- a/packages/trpc/lib/__tests__/search.test.ts +++ b/packages/trpc/lib/__tests__/search.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it } from "vitest"; -import { getInMemoryDB } from "@hoarder/db/drizzle"; +import { getInMemoryDB } from "@karakeep/db/drizzle"; import { bookmarkAssets, bookmarkLinks, @@ -13,9 +13,9 @@ import { rssFeedsTable, tagsOnBookmarks, users, -} from "@hoarder/db/schema"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; -import { Matcher } from "@hoarder/shared/types/search"; +} from "@karakeep/db/schema"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; +import { Matcher } from "@karakeep/shared/types/search"; import { AuthedContext } from "../.."; import { getBookmarkIdsFromMatcher } from "../search"; diff --git a/packages/trpc/lib/attachments.ts b/packages/trpc/lib/attachments.ts index 29c99172..15cbba74 100644 --- a/packages/trpc/lib/attachments.ts +++ b/packages/trpc/lib/attachments.ts @@ -1,7 +1,10 @@ import { z } from "zod"; -import { AssetTypes } from "@hoarder/db/schema"; -import { ZAssetType, zAssetTypesSchema } from "@hoarder/shared/types/bookmarks"; +import { AssetTypes } from "@karakeep/db/schema"; +import { + ZAssetType, + zAssetTypesSchema, +} from "@karakeep/shared/types/bookmarks"; export function mapDBAssetTypeToUserType(assetType: AssetTypes): ZAssetType { const map: Record<AssetTypes, z.infer<typeof zAssetTypesSchema>> = { diff --git a/packages/trpc/lib/search.ts b/packages/trpc/lib/search.ts index 83dfa674..ec582ef9 100644 --- a/packages/trpc/lib/search.ts +++ b/packages/trpc/lib/search.ts @@ -23,8 +23,8 @@ import { rssFeedImportsTable, rssFeedsTable, tagsOnBookmarks, -} from "@hoarder/db/schema"; -import { Matcher } from "@hoarder/shared/types/search"; +} from "@karakeep/db/schema"; +import { Matcher } from "@karakeep/shared/types/search"; import { AuthedContext } from ".."; diff --git a/packages/trpc/models/lists.ts b/packages/trpc/models/lists.ts index 7870bf90..5c87a8bd 100644 --- a/packages/trpc/models/lists.ts +++ b/packages/trpc/models/lists.ts @@ -3,14 +3,14 @@ import { and, count, eq } from "drizzle-orm"; import invariant from "tiny-invariant"; import { z } from "zod"; -import { SqliteError } from "@hoarder/db"; -import { bookmarkLists, bookmarksInLists } from "@hoarder/db/schema"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; +import { SqliteError } from "@karakeep/db"; +import { bookmarkLists, bookmarksInLists } from "@karakeep/db/schema"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; import { ZBookmarkList, zEditBookmarkListSchemaWithValidation, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import { AuthedContext } from ".."; import { getBookmarkIdsFromMatcher } from "../lib/search"; diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 28826e7c..8cb74f0b 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/package.json", - "name": "@hoarder/trpc", + "name": "@karakeep/trpc", "version": "0.1.0", "private": true, "type": "module", @@ -13,8 +13,8 @@ "test": "vitest" }, "dependencies": { - "@hoarder/db": "workspace:*", - "@hoarder/shared": "workspace:*", + "@karakeep/db": "workspace:*", + "@karakeep/shared": "workspace:*", "@trpc/server": "11.0.0", "bcryptjs": "^2.4.3", "drizzle-orm": "^0.38.3", @@ -23,9 +23,9 @@ "zod": "^3.22.4" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@types/bcryptjs": "^2.4.6", "vite-tsconfig-paths": "^4.3.1", "vitest": "^1.6.1" @@ -33,8 +33,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/packages/trpc/routers/admin.ts b/packages/trpc/routers/admin.ts index 337f050c..9b44f7c9 100644 --- a/packages/trpc/routers/admin.ts +++ b/packages/trpc/routers/admin.ts @@ -2,8 +2,8 @@ import { TRPCError } from "@trpc/server"; import { count, eq, sum } from "drizzle-orm"; import { z } from "zod"; -import { assets, bookmarkLinks, bookmarks, users } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; +import { assets, bookmarkLinks, bookmarks, users } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; import { AssetPreprocessingQueue, FeedQueue, @@ -15,12 +15,12 @@ import { triggerSearchReindex, VideoWorkerQueue, WebhookQueue, -} from "@hoarder/shared/queues"; +} from "@karakeep/shared/queues"; import { changeRoleSchema, resetPasswordSchema, zAdminCreateUserSchema, -} from "@hoarder/shared/types/admin"; +} from "@karakeep/shared/types/admin"; import { hashPassword } from "../auth"; import { adminProcedure, router } from "../index"; diff --git a/packages/trpc/routers/apiKeys.ts b/packages/trpc/routers/apiKeys.ts index c55dc095..eb52189b 100644 --- a/packages/trpc/routers/apiKeys.ts +++ b/packages/trpc/routers/apiKeys.ts @@ -2,8 +2,8 @@ import { TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { apiKeys } from "@hoarder/db/schema"; -import serverConfig from "@hoarder/shared/config"; +import { apiKeys } from "@karakeep/db/schema"; +import serverConfig from "@karakeep/shared/config"; import { authenticateApiKey, diff --git a/packages/trpc/routers/assets.test.ts b/packages/trpc/routers/assets.test.ts index d7db35be..822e48b1 100644 --- a/packages/trpc/routers/assets.test.ts +++ b/packages/trpc/routers/assets.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, test } from "vitest"; -import { assets, AssetTypes } from "@hoarder/db/schema"; -import { BookmarkTypes, ZAssetType } from "@hoarder/shared/types/bookmarks"; +import { assets, AssetTypes } from "@karakeep/db/schema"; +import { BookmarkTypes, ZAssetType } from "@karakeep/shared/types/bookmarks"; import type { CustomTestContext } from "../testUtils"; import { defaultBeforeEach } from "../testUtils"; diff --git a/packages/trpc/routers/assets.ts b/packages/trpc/routers/assets.ts index 45eac068..af508a4e 100644 --- a/packages/trpc/routers/assets.ts +++ b/packages/trpc/routers/assets.ts @@ -2,12 +2,12 @@ import { TRPCError } from "@trpc/server"; import { and, desc, eq, sql } from "drizzle-orm"; import { z } from "zod"; -import { assets, bookmarks } from "@hoarder/db/schema"; -import { deleteAsset } from "@hoarder/shared/assetdb"; +import { assets, bookmarks } from "@karakeep/db/schema"; +import { deleteAsset } from "@karakeep/shared/assetdb"; import { zAssetSchema, zAssetTypesSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import { authedProcedure, Context, router } from "../index"; import { diff --git a/packages/trpc/routers/bookmarks.test.ts b/packages/trpc/routers/bookmarks.test.ts index c3469acc..f83ec5aa 100644 --- a/packages/trpc/routers/bookmarks.test.ts +++ b/packages/trpc/routers/bookmarks.test.ts @@ -1,7 +1,7 @@ import { assert, beforeEach, describe, expect, test } from "vitest"; -import { bookmarks } from "@hoarder/db/schema"; -import { BookmarkTypes } from "@hoarder/shared/types/bookmarks"; +import { bookmarks } from "@karakeep/db/schema"; +import { BookmarkTypes } from "@karakeep/shared/types/bookmarks"; import type { CustomTestContext } from "../testUtils"; import { defaultBeforeEach } from "../testUtils"; diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts index 5e6df4a5..fdb99257 100644 --- a/packages/trpc/routers/bookmarks.ts +++ b/packages/trpc/routers/bookmarks.ts @@ -18,9 +18,9 @@ import { z } from "zod"; import type { ZBookmark, ZBookmarkContent, -} from "@hoarder/shared/types/bookmarks"; -import type { ZBookmarkTags } from "@hoarder/shared/types/tags"; -import { db as DONT_USE_db } from "@hoarder/db"; +} from "@karakeep/shared/types/bookmarks"; +import type { ZBookmarkTags } from "@karakeep/shared/types/tags"; +import { db as DONT_USE_db } from "@karakeep/db"; import { assets, AssetTypes, @@ -33,14 +33,14 @@ import { customPrompts, rssFeedImportsTable, tagsOnBookmarks, -} from "@hoarder/db/schema"; +} from "@karakeep/db/schema"; import { deleteAsset, SUPPORTED_BOOKMARK_ASSET_TYPES, -} from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; -import { InferenceClientFactory } from "@hoarder/shared/inference"; -import { buildSummaryPrompt } from "@hoarder/shared/prompts"; +} from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; +import { InferenceClientFactory } from "@karakeep/shared/inference"; +import { buildSummaryPrompt } from "@karakeep/shared/prompts"; import { AssetPreprocessingQueue, LinkCrawlerQueue, @@ -48,9 +48,9 @@ import { triggerSearchDeletion, triggerSearchReindex, triggerWebhook, -} from "@hoarder/shared/queues"; -import { getSearchIdxClient } from "@hoarder/shared/search"; -import { parseSearchQuery } from "@hoarder/shared/searchQueryParser"; +} from "@karakeep/shared/queues"; +import { getSearchIdxClient } from "@karakeep/shared/search"; +import { parseSearchQuery } from "@karakeep/shared/searchQueryParser"; import { BookmarkTypes, DEFAULT_NUM_BOOKMARKS_PER_PAGE, @@ -62,7 +62,7 @@ import { zSearchBookmarksCursor, zSearchBookmarksRequestSchema, zUpdateBookmarksRequestSchema, -} from "@hoarder/shared/types/bookmarks"; +} from "@karakeep/shared/types/bookmarks"; import type { AuthedContext, Context } from "../index"; import { authedProcedure, router } from "../index"; diff --git a/packages/trpc/routers/feeds.ts b/packages/trpc/routers/feeds.ts index e5520474..819ba8ef 100644 --- a/packages/trpc/routers/feeds.ts +++ b/packages/trpc/routers/feeds.ts @@ -2,13 +2,13 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { rssFeedsTable } from "@hoarder/db/schema"; -import { FeedQueue } from "@hoarder/shared/queues"; +import { rssFeedsTable } from "@karakeep/db/schema"; +import { FeedQueue } from "@karakeep/shared/queues"; import { zFeedSchema, zNewFeedSchema, zUpdateFeedSchema, -} from "@hoarder/shared/types/feeds"; +} from "@karakeep/shared/types/feeds"; import { authedProcedure, Context, router } from "../index"; diff --git a/packages/trpc/routers/highlights.ts b/packages/trpc/routers/highlights.ts index 86da560b..3436653e 100644 --- a/packages/trpc/routers/highlights.ts +++ b/packages/trpc/routers/highlights.ts @@ -2,15 +2,15 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, desc, eq, lt, lte, or } from "drizzle-orm"; import { z } from "zod"; -import { highlights } from "@hoarder/db/schema"; +import { highlights } from "@karakeep/db/schema"; import { DEFAULT_NUM_HIGHLIGHTS_PER_PAGE, zGetAllHighlightsResponseSchema, zHighlightSchema, zNewHighlightSchema, zUpdateHighlightSchema, -} from "@hoarder/shared/types/highlights"; -import { zCursorV2 } from "@hoarder/shared/types/pagination"; +} from "@karakeep/shared/types/highlights"; +import { zCursorV2 } from "@karakeep/shared/types/pagination"; import { authedProcedure, Context, router } from "../index"; import { ensureBookmarkOwnership } from "./bookmarks"; diff --git a/packages/trpc/routers/lists.ts b/packages/trpc/routers/lists.ts index f9e382f2..f988eb8b 100644 --- a/packages/trpc/routers/lists.ts +++ b/packages/trpc/routers/lists.ts @@ -5,7 +5,7 @@ import { zBookmarkListSchema, zEditBookmarkListSchemaWithValidation, zNewBookmarkListSchema, -} from "@hoarder/shared/types/lists"; +} from "@karakeep/shared/types/lists"; import type { AuthedContext } from "../index"; import { authedProcedure, router } from "../index"; diff --git a/packages/trpc/routers/prompts.ts b/packages/trpc/routers/prompts.ts index 629d5829..d3942e69 100644 --- a/packages/trpc/routers/prompts.ts +++ b/packages/trpc/routers/prompts.ts @@ -2,12 +2,12 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { customPrompts } from "@hoarder/db/schema"; +import { customPrompts } from "@karakeep/db/schema"; import { zNewPromptSchema, zPromptSchema, zUpdatePromptSchema, -} from "@hoarder/shared/types/prompts"; +} from "@karakeep/shared/types/prompts"; import { authedProcedure, Context, router } from "../index"; diff --git a/packages/trpc/routers/tags.ts b/packages/trpc/routers/tags.ts index c080bad8..7378c66f 100644 --- a/packages/trpc/routers/tags.ts +++ b/packages/trpc/routers/tags.ts @@ -2,14 +2,14 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq, inArray, notExists } from "drizzle-orm"; import { z } from "zod"; -import type { ZAttachedByEnum } from "@hoarder/shared/types/tags"; -import { SqliteError } from "@hoarder/db"; -import { bookmarkTags, tagsOnBookmarks } from "@hoarder/db/schema"; -import { triggerSearchReindex } from "@hoarder/shared/queues"; +import type { ZAttachedByEnum } from "@karakeep/shared/types/tags"; +import { SqliteError } from "@karakeep/db"; +import { bookmarkTags, tagsOnBookmarks } from "@karakeep/db/schema"; +import { triggerSearchReindex } from "@karakeep/shared/queues"; import { zGetTagResponseSchema, zUpdateTagRequestSchema, -} from "@hoarder/shared/types/tags"; +} from "@karakeep/shared/types/tags"; import type { Context } from "../index"; import { authedProcedure, router } from "../index"; diff --git a/packages/trpc/routers/users.ts b/packages/trpc/routers/users.ts index a78ec9b4..75a1db0c 100644 --- a/packages/trpc/routers/users.ts +++ b/packages/trpc/routers/users.ts @@ -3,21 +3,21 @@ import { and, count, eq } from "drizzle-orm"; import invariant from "tiny-invariant"; import { z } from "zod"; -import { SqliteError } from "@hoarder/db"; +import { SqliteError } from "@karakeep/db"; import { bookmarkLists, bookmarks, bookmarkTags, highlights, users, -} from "@hoarder/db/schema"; -import { deleteUserAssets } from "@hoarder/shared/assetdb"; -import serverConfig from "@hoarder/shared/config"; +} from "@karakeep/db/schema"; +import { deleteUserAssets } from "@karakeep/shared/assetdb"; +import serverConfig from "@karakeep/shared/config"; import { zSignUpSchema, zUserStatsResponseSchema, zWhoAmIResponseSchema, -} from "@hoarder/shared/types/users"; +} from "@karakeep/shared/types/users"; import { hashPassword, validatePassword } from "../auth"; import { diff --git a/packages/trpc/routers/webhooks.ts b/packages/trpc/routers/webhooks.ts index 173e4f5a..ab2a6908 100644 --- a/packages/trpc/routers/webhooks.ts +++ b/packages/trpc/routers/webhooks.ts @@ -2,12 +2,12 @@ import { experimental_trpcMiddleware, TRPCError } from "@trpc/server"; import { and, eq } from "drizzle-orm"; import { z } from "zod"; -import { webhooksTable } from "@hoarder/db/schema"; +import { webhooksTable } from "@karakeep/db/schema"; import { zNewWebhookSchema, zUpdateWebhookSchema, zWebhookSchema, -} from "@hoarder/shared/types/webhooks"; +} from "@karakeep/shared/types/webhooks"; import { authedProcedure, Context, router } from "../index"; diff --git a/packages/trpc/testUtils.ts b/packages/trpc/testUtils.ts index 23dcdb33..b8b6ac8d 100644 --- a/packages/trpc/testUtils.ts +++ b/packages/trpc/testUtils.ts @@ -1,5 +1,5 @@ -import { getInMemoryDB } from "@hoarder/db/drizzle"; -import { users } from "@hoarder/db/schema"; +import { getInMemoryDB } from "@karakeep/db/drizzle"; +import { users } from "@karakeep/db/schema"; import { createCallerFactory } from "./index"; import { appRouter } from "./routers/_app"; diff --git a/packages/trpc/tsconfig.json b/packages/trpc/tsconfig.json index dbd0afdc..a795b96a 100644 --- a/packages/trpc/tsconfig.json +++ b/packages/trpc/tsconfig.json @@ -1,6 +1,6 @@ { "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@hoarder/tsconfig/node.json", + "extends": "@karakeep/tsconfig/node.json", "include": ["**/*.ts"], "exclude": ["node_modules"], "compilerOptions": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5c0c3ee3..c1e9449c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: .: devDependencies: - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:tooling/prettier '@tanstack/eslint-plugin-query': @@ -46,13 +46,13 @@ importers: apps/browser-extension: dependencies: - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../../packages/shared - '@hoarder/shared-react': + '@karakeep/shared-react': specifier: workspace:^0.1.0 version: link:../../packages/shared-react - '@hoarder/trpc': + '@karakeep/trpc': specifier: workspace:^0.1.0 version: link:../../packages/trpc '@radix-ui/react-dialog': @@ -122,16 +122,16 @@ importers: '@crxjs/vite-plugin': specifier: 2.0.0-beta.28 version: 2.0.0-beta.28 - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tailwind-config': + '@karakeep/tailwind-config': specifier: workspace:^0.1.0 version: link:../../tooling/tailwind - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@types/chrome': @@ -176,19 +176,19 @@ importers: '@commander-js/extra-typings': specifier: ^12.0.1 version: 12.0.1(commander@12.0.0) - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../../packages/shared - '@hoarder/trpc': + '@karakeep/trpc': specifier: workspace:^0.1.0 version: link:../../packages/trpc - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@trpc/client': @@ -255,16 +255,16 @@ importers: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.1) devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tailwind-config': + '@karakeep/tailwind-config': specifier: workspace:^0.1.0 version: link:../../tooling/tailwind - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@tailwindcss/typography': @@ -297,13 +297,13 @@ importers: apps/mobile: dependencies: - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../../packages/shared - '@hoarder/shared-react': + '@karakeep/shared-react': specifier: workspace:^0.1.0 version: link:../../packages/shared-react - '@hoarder/trpc': + '@karakeep/trpc': specifier: workspace:^0.1.0 version: link:../../packages/trpc '@react-native-menu/menu': @@ -427,16 +427,16 @@ importers: '@babel/core': specifier: ^7.20.0 version: 7.26.0 - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tailwind-config': + '@karakeep/tailwind-config': specifier: workspace:^0.1.0 version: link:../../tooling/tailwind - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@types/react': @@ -472,21 +472,21 @@ importers: '@emoji-mart/react': specifier: ^1.1.1 version: 1.1.1(emoji-mart@5.5.2)(react@18.3.1) - '@hoarder/db': + '@hookform/resolvers': + specifier: ^3.3.4 + version: 3.3.4(react-hook-form@7.50.1(react@18.3.1)) + '@karakeep/db': specifier: workspace:^0.1.0 version: link:../../packages/db - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../../packages/shared - '@hoarder/shared-react': + '@karakeep/shared-react': specifier: workspace:^0.1.0 version: link:../../packages/shared-react - '@hoarder/trpc': + '@karakeep/trpc': specifier: workspace:^0.1.0 version: link:../../packages/trpc - '@hookform/resolvers': - specifier: ^3.3.4 - version: 3.3.4(react-hook-form@7.50.1(react@18.3.1)) '@lexical/list': specifier: ^0.20.2 version: 0.20.2 @@ -689,16 +689,16 @@ importers: specifier: ^4.5.1 version: 4.5.1(@types/react@18.2.58)(react@18.3.1) devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tailwind-config': + '@karakeep/tailwind-config': specifier: workspace:^0.1.0 version: link:../../tooling/tailwind - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@types/csv-parse': @@ -740,16 +740,16 @@ importers: '@ghostery/adblocker-puppeteer': specifier: ^2.1.1 version: 2.1.1(puppeteer@22.3.0(typescript@5.7.3)) - '@hoarder/db': + '@karakeep/db': specifier: workspace:^0.1.0 version: link:../../packages/db - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../../packages/shared - '@hoarder/trpc': + '@karakeep/trpc': specifier: workspace:^0.1.0 version: link:../../packages/trpc - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@mozilla/readability': @@ -858,10 +858,10 @@ importers: specifier: ^3.22.4 version: 3.22.4 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier '@types/jsdom': @@ -922,7 +922,7 @@ importers: '@auth/core': specifier: ^0.27.0 version: 0.27.0 - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:* version: link:../shared '@paralleldrive/cuid2': @@ -941,13 +941,13 @@ importers: specifier: ^4.7.1 version: 4.7.1 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@tsconfig/node22': @@ -962,23 +962,23 @@ importers: packages/e2e_tests: dependencies: - '@hoarder/trpc': - specifier: workspace:^0.1.0 - version: link:../trpc - '@hoarderapp/sdk': + '@karakeep/sdk': specifier: workspace:* version: link:../sdk + '@karakeep/trpc': + specifier: workspace:^0.1.0 + version: link:../trpc superjson: specifier: ^2.2.1 version: 2.2.1 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript vite-tsconfig-paths: @@ -993,20 +993,20 @@ importers: '@asteasolutions/zod-to-openapi': specifier: ^7.2.0 version: 7.2.0(zod@3.22.4) - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../shared zod: specifier: ^3.22.4 version: 3.22.4 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript tsx: @@ -1019,13 +1019,13 @@ importers: specifier: ^0.13.3 version: 0.13.3 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@tsconfig/node22': @@ -1071,13 +1071,13 @@ importers: specifier: ^3.24.3 version: 3.24.3(zod@3.22.4) devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript vitest: @@ -1086,10 +1086,10 @@ importers: packages/shared-react: dependencies: - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:^0.1.0 version: link:../shared - '@hoarder/trpc': + '@karakeep/trpc': specifier: workspace:^0.1.0 version: link:../trpc '@tanstack/react-query': @@ -1108,22 +1108,22 @@ importers: specifier: ^2.2.1 version: 2.2.1 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript packages/trpc: dependencies: - '@hoarder/db': + '@karakeep/db': specifier: workspace:* version: link:../db - '@hoarder/shared': + '@karakeep/shared': specifier: workspace:* version: link:../shared '@trpc/server': @@ -1145,13 +1145,13 @@ importers: specifier: ^3.22.4 version: 3.22.4 devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../../tooling/eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../../tooling/prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../../tooling/typescript '@types/bcryptjs': @@ -1191,10 +1191,10 @@ importers: specifier: ^4.6.0 version: 4.6.0(eslint@8.57.0) devDependencies: - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../typescript '@types/eslint': @@ -1224,7 +1224,7 @@ importers: specifier: ^0.5.11 version: 0.5.11(@ianvs/prettier-plugin-sort-imports@4.2.0(prettier@3.4.2))(prettier@3.4.2) devDependencies: - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../typescript typescript: @@ -1249,13 +1249,13 @@ importers: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.1) devDependencies: - '@hoarder/eslint-config': + '@karakeep/eslint-config': specifier: workspace:^0.2.0 version: link:../eslint - '@hoarder/prettier-config': + '@karakeep/prettier-config': specifier: workspace:^0.1.0 version: link:../prettier - '@hoarder/tsconfig': + '@karakeep/tsconfig': specifier: workspace:^0.1.0 version: link:../typescript eslint: diff --git a/tooling/eslint/package.json b/tooling/eslint/package.json index 090fadaf..8169ad1e 100644 --- a/tooling/eslint/package.json +++ b/tooling/eslint/package.json @@ -1,5 +1,5 @@ { - "name": "@hoarder/eslint-config", + "name": "@karakeep/eslint-config", "version": "0.2.0", "private": true, "license": "MIT", @@ -25,8 +25,8 @@ "eslint-plugin-react-hooks": "^4.6.0" }, "devDependencies": { - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "@types/eslint": "^8.56.5", "eslint": "^8.57.0", "prettier": "^3.4.2", @@ -38,5 +38,5 @@ "./base.js" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/tooling/eslint/tsconfig.json b/tooling/eslint/tsconfig.json index dcbd7d30..25ea271f 100644 --- a/tooling/eslint/tsconfig.json +++ b/tooling/eslint/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" }, diff --git a/tooling/github/package.json b/tooling/github/package.json index 42e5fc74..34fbfc8b 100644 --- a/tooling/github/package.json +++ b/tooling/github/package.json @@ -1,3 +1,3 @@ { - "name": "@hoarder/github" + "name": "@karakeep/github" } diff --git a/tooling/prettier/index.js b/tooling/prettier/index.js index bfc96896..97990bda 100644 --- a/tooling/prettier/index.js +++ b/tooling/prettier/index.js @@ -21,8 +21,8 @@ const config = { "^(expo(.*)$)|^(expo$)", "<THIRD_PARTY_MODULES>", "", - "<TYPES>^@hoarder", - "^@hoarder/(.*)$", + "<TYPES>^@karakeep", + "^@karakeep/(.*)$", "", "<TYPES>^[.|..|~]", "^~/", diff --git a/tooling/prettier/package.json b/tooling/prettier/package.json index eaae5aec..ec8b83c0 100644 --- a/tooling/prettier/package.json +++ b/tooling/prettier/package.json @@ -1,5 +1,5 @@ { - "name": "@hoarder/prettier-config", + "name": "@karakeep/prettier-config", "private": true, "version": "0.1.0", "type": "module", @@ -17,8 +17,8 @@ "prettier-plugin-tailwindcss": "^0.5.11" }, "devDependencies": { - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "typescript": "^5.7.3" }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/tooling/prettier/tsconfig.json b/tooling/prettier/tsconfig.json index dcbd7d30..25ea271f 100644 --- a/tooling/prettier/tsconfig.json +++ b/tooling/prettier/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" }, diff --git a/tooling/tailwind/package.json b/tooling/tailwind/package.json index 3c59c14a..4e9e0643 100644 --- a/tooling/tailwind/package.json +++ b/tooling/tailwind/package.json @@ -1,5 +1,5 @@ { - "name": "@hoarder/tailwind-config", + "name": "@karakeep/tailwind-config", "version": "0.1.0", "private": true, "type": "module", @@ -23,9 +23,9 @@ "tailwindcss-animate": "^1.0.7" }, "devDependencies": { - "@hoarder/eslint-config": "workspace:^0.2.0", - "@hoarder/prettier-config": "workspace:^0.1.0", - "@hoarder/tsconfig": "workspace:^0.1.0", + "@karakeep/eslint-config": "workspace:^0.2.0", + "@karakeep/prettier-config": "workspace:^0.1.0", + "@karakeep/tsconfig": "workspace:^0.1.0", "eslint": "^8.57.0", "prettier": "^3.4.2", "typescript": "^5.7.3" @@ -33,8 +33,8 @@ "eslintConfig": { "root": true, "extends": [ - "@hoarder/eslint-config/base" + "@karakeep/eslint-config/base" ] }, - "prettier": "@hoarder/prettier-config" + "prettier": "@karakeep/prettier-config" } diff --git a/tooling/tailwind/tsconfig.json b/tooling/tailwind/tsconfig.json index dcbd7d30..25ea271f 100644 --- a/tooling/tailwind/tsconfig.json +++ b/tooling/tailwind/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@hoarder/tsconfig/base.json", + "extends": "@karakeep/tsconfig/base.json", "compilerOptions": { "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" }, diff --git a/tooling/typescript/package.json b/tooling/typescript/package.json index 885f8473..a6c28bf4 100644 --- a/tooling/typescript/package.json +++ b/tooling/typescript/package.json @@ -1,5 +1,5 @@ { - "name": "@hoarder/tsconfig", + "name": "@karakeep/tsconfig", "private": true, "version": "0.1.0", "files": [ |