⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
refactor: update import paths to use specific utility modules
daniel31x13e9c1c5217bae
diff --git a/apps/web/components/CollectionListing.tsx b/apps/web/components/CollectionListing.tsxindex 3d932442..f145bb5c 100644--- a/apps/web/components/CollectionListing.tsx+++ b/apps/web/components/CollectionListing.tsx@@ -23,7 +23,7 @@ import { useUpdateUser, useUser } from "@linkwarden/router/user";import Icon from "./Icon";import { IconWeight } from "@phosphor-icons/react";import Droppable from "./Droppable";-import { cn } from "@linkwarden/lib";+import { cn } from "@linkwarden/lib/utils";import { Active, useDndContext } from "@dnd-kit/core";interface ExtendedTreeItem extends TreeItem {diff --git a/apps/web/components/DashboardLayoutDropdown.tsx b/apps/web/components/DashboardLayoutDropdown.tsxindex d1e18bf0..a456486f 100644--- a/apps/web/components/DashboardLayoutDropdown.tsx+++ b/apps/web/components/DashboardLayoutDropdown.tsx@@ -29,7 +29,7 @@ import {useSensors,} from "@dnd-kit/core";import { restrictToParentElement } from "@dnd-kit/modifiers";-import { cn } from "@linkwarden/lib";+import { cn } from "@linkwarden/lib/utils";import toast from "react-hot-toast";interface DashboardSectionOption {diff --git a/apps/web/components/DashboardLinks.tsx b/apps/web/components/DashboardLinks.tsxindex ac8ad1ef..acd8605b 100644--- a/apps/web/components/DashboardLinks.tsx+++ b/apps/web/components/DashboardLinks.tsx@@ -26,7 +26,7 @@ import LinkTypeBadge from "./LinkViews/LinkComponents/LinkTypeBadge";import LinkPin from "./LinkViews/LinkComponents/LinkPin";import { Separator } from "./ui/separator";import { useDraggable } from "@dnd-kit/core";-import { cn } from "@linkwarden/lib";+import { cn } from "@linkwarden/lib/utils";import { useTranslation } from "next-i18next";export function DashboardLinks({diff --git a/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx b/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsxindex 071c6e2c..4ed476be 100644--- a/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx+++ b/apps/web/components/LinkViews/LinkComponents/LinkMasonry.tsx@@ -25,7 +25,7 @@ import openLink from "@/lib/client/openLink";import { Button } from "@/components/ui/button";import { Separator } from "@/components/ui/separator";import { useDraggable } from "@dnd-kit/core";-import { cn } from "@linkwarden/lib";+import { cn } from "@linkwarden/lib/utils";import { TFunction } from "i18next";type Props = {diff --git a/apps/web/components/Preservation/PreservationContent.tsx b/apps/web/components/Preservation/PreservationContent.tsxindex d36aa151..f18d5bfe 100644--- a/apps/web/components/Preservation/PreservationContent.tsx+++ b/apps/web/components/Preservation/PreservationContent.tsx@@ -9,10 +9,7 @@ import {LinkIncludingShortenedCollectionAndTags,ArchivedFormat,} from "@linkwarden/types";-import {- atLeastOneFormatAvailable,- formatAvailable,-} from "@linkwarden/lib/formatStats";+import { formatAvailable } from "@linkwarden/lib/formatStats";import getLinkTypeFromFormat from "@linkwarden/lib/getLinkTypeFromFormat";type Props = {diff --git a/apps/web/components/TagListing.tsx b/apps/web/components/TagListing.tsxindex 368f1bdb..b8ed2f28 100644--- a/apps/web/components/TagListing.tsx+++ b/apps/web/components/TagListing.tsx@@ -2,7 +2,7 @@ import { Tag } from "@linkwarden/prisma/client";import Link from "next/link";import { useTranslation } from "react-i18next";import Droppable from "./Droppable";-import { cn } from "@linkwarden/lib";+import { cn } from "@linkwarden/lib/utils";import { useDndContext } from "@dnd-kit/core";interface TagListingProps {diff --git a/apps/web/components/TextInput.tsx b/apps/web/components/TextInput.tsxindex 97690a09..1857e781 100644--- a/apps/web/components/TextInput.tsx+++ b/apps/web/components/TextInput.tsx@@ -1,4 +1,4 @@-import { cn } from "@linkwarden/lib";+import { cn } from "@linkwarden/lib/utils";import React, { forwardRef } from "react";export type TextInputProps = React.ComponentPropsWithoutRef<"input">;diff --git a/apps/web/hooks/useArchivalTags.ts b/apps/web/hooks/useArchivalTags.tsindex d11aa637..8278818e 100644--- a/apps/web/hooks/useArchivalTags.ts+++ b/apps/web/hooks/useArchivalTags.ts@@ -5,7 +5,7 @@ import {} from "@linkwarden/types/inputSelect";import { useState, useEffect } from "react";import { useTranslation } from "next-i18next";-import { isArchivalTag } from "@linkwarden/lib";+import { isArchivalTag } from "@linkwarden/lib/isArchivalTag";const useArchivalTags = (initialTags: Tag[]) => {const [archivalTags, setArchivalTags] = useState<ArchivalTagOption[]>([]);diff --git a/apps/web/lib/api/controllers/collections/collectionId/deleteCollectionById.ts b/apps/web/lib/api/controllers/collections/collectionId/deleteCollectionById.tsindex 5765f329..c8206ebe 100644--- a/apps/web/lib/api/controllers/collections/collectionId/deleteCollectionById.ts+++ b/apps/web/lib/api/controllers/collections/collectionId/deleteCollectionById.ts@@ -1,8 +1,8 @@import { prisma } from "@linkwarden/prisma";import getPermission from "@/lib/api/getPermission";-import { Link, UsersAndCollections } from "@linkwarden/prisma/client";+import { UsersAndCollections } from "@linkwarden/prisma/client";import { removeFolder } from "@linkwarden/filesystem";-import { meiliClient } from "@linkwarden/lib";+import { meiliClient } from "@linkwarden/lib/meilisearchClient";export default async function deleteCollection(userId: number,diff --git a/apps/web/lib/api/controllers/links/bulk/deleteLinksById.ts b/apps/web/lib/api/controllers/links/bulk/deleteLinksById.tsindex 0d4c6496..df08a25e 100644--- a/apps/web/lib/api/controllers/links/bulk/deleteLinksById.ts+++ b/apps/web/lib/api/controllers/links/bulk/deleteLinksById.ts@@ -2,7 +2,7 @@ import { prisma } from "@linkwarden/prisma";import { UsersAndCollections } from "@linkwarden/prisma/client";import getPermission from "@/lib/api/getPermission";import { removeFiles } from "@linkwarden/filesystem";-import { meiliClient } from "@linkwarden/lib";+import { meiliClient } from "@linkwarden/lib/meilisearchClient";export default async function deleteLinksById(userId: number,diff --git a/apps/web/lib/api/controllers/links/linkId/deleteLinkById.ts b/apps/web/lib/api/controllers/links/linkId/deleteLinkById.tsindex 208c8849..96637ccd 100644--- a/apps/web/lib/api/controllers/links/linkId/deleteLinkById.ts+++ b/apps/web/lib/api/controllers/links/linkId/deleteLinkById.ts@@ -2,7 +2,7 @@ import { prisma } from "@linkwarden/prisma";import { Link, UsersAndCollections } from "@linkwarden/prisma/client";import getPermission from "@/lib/api/getPermission";import { removeFiles } from "@linkwarden/filesystem";-import { meiliClient } from "@linkwarden/lib";+import { meiliClient } from "@linkwarden/lib/meilisearchClient";export default async function deleteLink(userId: number, linkId: number) {if (!linkId) return { response: "Please choose a valid link.", status: 401 };diff --git a/apps/web/lib/api/controllers/links/postLink.ts b/apps/web/lib/api/controllers/links/postLink.tsindex 044c091b..36d37e6a 100644--- a/apps/web/lib/api/controllers/links/postLink.ts+++ b/apps/web/lib/api/controllers/links/postLink.ts@@ -6,7 +6,7 @@ import {PostLinkSchema,PostLinkSchemaType,} from "@linkwarden/lib/schemaValidation";-import { hasPassedLimit } from "@linkwarden/lib";+import { hasPassedLimit } from "@linkwarden/lib/verifyCapacity";export default async function postLink(body: PostLinkSchemaType,diff --git a/apps/web/lib/api/controllers/migration/importFromHTMLFile.ts b/apps/web/lib/api/controllers/migration/importFromHTMLFile.tsindex fe4dfe37..2ef26f02 100644--- a/apps/web/lib/api/controllers/migration/importFromHTMLFile.ts+++ b/apps/web/lib/api/controllers/migration/importFromHTMLFile.ts@@ -3,7 +3,7 @@ import { createFolder } from "@linkwarden/filesystem";import { JSDOM } from "jsdom";import { decodeHTML } from "entities";import { parse, Node, Element, TextNode } from "himalaya";-import { hasPassedLimit } from "@linkwarden/lib";+import { hasPassedLimit } from "@linkwarden/lib/verifyCapacity";export default async function importFromHTMLFile(userId: number,diff --git a/apps/web/lib/api/controllers/migration/importFromLinkwarden.ts b/apps/web/lib/api/controllers/migration/importFromLinkwarden.tsindex 530a370b..6af5609c 100644--- a/apps/web/lib/api/controllers/migration/importFromLinkwarden.ts+++ b/apps/web/lib/api/controllers/migration/importFromLinkwarden.ts@@ -1,7 +1,7 @@import { prisma } from "@linkwarden/prisma";import { Backup } from "@linkwarden/types";import { createFolder } from "@linkwarden/filesystem";-import { hasPassedLimit } from "@linkwarden/lib";+import { hasPassedLimit } from "@linkwarden/lib/verifyCapacity";export default async function importFromLinkwarden(userId: number,diff --git a/apps/web/lib/api/controllers/migration/importFromOmnivore.ts b/apps/web/lib/api/controllers/migration/importFromOmnivore.tsindex 58849cc9..e9b0baa0 100644--- a/apps/web/lib/api/controllers/migration/importFromOmnivore.ts+++ b/apps/web/lib/api/controllers/migration/importFromOmnivore.ts@@ -1,6 +1,6 @@import { prisma } from "@linkwarden/prisma";import { createFolder } from "@linkwarden/filesystem";-import { hasPassedLimit } from "@linkwarden/lib";+import { hasPassedLimit } from "@linkwarden/lib/verifyCapacity";type OmnivoreItem = {id: string;diff --git a/apps/web/lib/api/controllers/migration/importFromPocket.ts b/apps/web/lib/api/controllers/migration/importFromPocket.tsindex fc3cf425..02c901bd 100644--- a/apps/web/lib/api/controllers/migration/importFromPocket.ts+++ b/apps/web/lib/api/controllers/migration/importFromPocket.ts@@ -1,6 +1,6 @@import { prisma } from "@linkwarden/prisma";import { createFolder } from "@linkwarden/filesystem";-import { hasPassedLimit } from "@linkwarden/lib";+import { hasPassedLimit } from "@linkwarden/lib/verifyCapacity";import Papa from "papaparse";type PocketBackup = {diff --git a/apps/web/lib/api/controllers/migration/importFromWallabag.ts b/apps/web/lib/api/controllers/migration/importFromWallabag.tsindex e4aeb58f..d25c0475 100644--- a/apps/web/lib/api/controllers/migration/importFromWallabag.ts+++ b/apps/web/lib/api/controllers/migration/importFromWallabag.ts@@ -1,6 +1,6 @@import { prisma } from "@linkwarden/prisma";import { createFolder } from "@linkwarden/filesystem";-import { hasPassedLimit } from "@linkwarden/lib";+import { hasPassedLimit } from "@linkwarden/lib/verifyCapacity";type WallabagBackup = {is_archived: number;diff --git a/apps/web/lib/api/controllers/search/searchLinks.ts b/apps/web/lib/api/controllers/search/searchLinks.tsindex b1fafcd1..e7822ce7 100644--- a/apps/web/lib/api/controllers/search/searchLinks.ts+++ b/apps/web/lib/api/controllers/search/searchLinks.ts@@ -1,6 +1,6 @@import { prisma } from "@linkwarden/prisma";import { LinkRequestQuery, Order, Sort } from "@linkwarden/types";-import { meiliClient } from "@linkwarden/lib";+import { meiliClient } from "@linkwarden/lib/meilisearchClient";import {buildMeiliFilters,buildMeiliQuery,diff --git a/apps/web/lib/api/controllers/users/userId/deleteUserById.ts b/apps/web/lib/api/controllers/users/userId/deleteUserById.tsindex 4d9b25c7..f12bcf38 100644--- a/apps/web/lib/api/controllers/users/userId/deleteUserById.ts+++ b/apps/web/lib/api/controllers/users/userId/deleteUserById.ts@@ -3,7 +3,7 @@ import bcrypt from "bcrypt";import { removeFolder, removeFile } from "@linkwarden/filesystem";import { DeleteUserBody } from "@linkwarden/types";import updateSeats from "@/lib/api/stripe/updateSeats";-import { meiliClient } from "@linkwarden/lib";+import { meiliClient } from "@linkwarden/lib/meilisearchClient";import stripeSDK from "@/lib/api/stripe/stripeSDK";import transporter from "@linkwarden/lib/transporter";diff --git a/apps/web/pages/api/v1/archives/[linkId].ts b/apps/web/pages/api/v1/archives/[linkId].tsindex 764d13bd..42577f07 100644--- a/apps/web/pages/api/v1/archives/[linkId].ts+++ b/apps/web/pages/api/v1/archives/[linkId].ts@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from "next";import formidable from "formidable";import fs from "fs";import { readFile, createFile, createFolder } from "@linkwarden/filesystem";-import { generatePreview } from "@linkwarden/lib";+import { generatePreview } from "@linkwarden/lib/generatePreview";import verifyToken from "@/lib/api/verifyToken";import verifyUser from "@/lib/api/verifyUser";import getPermission from "@/lib/api/getPermission";diff --git a/apps/web/pages/api/v1/archives/index.ts b/apps/web/pages/api/v1/archives/index.tsindex 0142e91d..e85688cb 100644--- a/apps/web/pages/api/v1/archives/index.ts+++ b/apps/web/pages/api/v1/archives/index.ts@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from "next";import formidable from "formidable";import fs from "fs";import { createFile, createFolder } from "@linkwarden/filesystem";-import { generatePreview } from "@linkwarden/lib";+import { generatePreview } from "@linkwarden/lib/generatePreview";import verifyUser from "@/lib/api/verifyUser";import { prisma } from "@linkwarden/prisma";import { UsersAndCollections } from "@linkwarden/prisma/client";diff --git a/apps/web/pages/api/v1/rss/index.ts b/apps/web/pages/api/v1/rss/index.tsindex 54d172e4..59cc681e 100644--- a/apps/web/pages/api/v1/rss/index.ts+++ b/apps/web/pages/api/v1/rss/index.ts@@ -1,5 +1,5 @@import { prisma } from "@linkwarden/prisma";-import { rssHandler } from "@linkwarden/lib";+import { rssHandler } from "@linkwarden/lib/rssHandler";import setCollection from "@/lib/api/setCollection";import verifyUser from "@/lib/api/verifyUser";import { PostRssSubscriptionSchema } from "@linkwarden/lib/schemaValidation";diff --git a/apps/web/pages/api/v1/worker/preservation.tsx b/apps/web/pages/api/v1/worker/preservation.tsxindex b749d364..a5c46926 100644--- a/apps/web/pages/api/v1/worker/preservation.tsx+++ b/apps/web/pages/api/v1/worker/preservation.tsx@@ -4,7 +4,7 @@ import { prisma } from "@linkwarden/prisma";import { DeletePreservationsSchema } from "@linkwarden/lib/schemaValidation";import { removeFiles } from "@linkwarden/filesystem";import { ArchivalSettings } from "@linkwarden/types";-import { isArchivalTag } from "@linkwarden/lib";+import { isArchivalTag } from "@linkwarden/lib/isArchivalTag";export default async function links(req: NextApiRequest, res: NextApiResponse) {const user = await verifyUser({ req, res });diff --git a/apps/web/pages/settings/preference.tsx b/apps/web/pages/settings/preference.tsxindex 547f7c31..7d961d12 100644--- a/apps/web/pages/settings/preference.tsx+++ b/apps/web/pages/settings/preference.tsx@@ -15,7 +15,7 @@ import { useConfig } from "@linkwarden/router/config";import { useTags, useUpsertTags } from "@linkwarden/router/tags";import TagSelection from "@/components/InputSelect/TagSelection";import { useArchivalTags } from "@/hooks/useArchivalTags";-import { isArchivalTag } from "@linkwarden/lib";+import { isArchivalTag } from "@linkwarden/lib/isArchivalTag";import { Button } from "@/components/ui/button";import {Tooltip,diff --git a/apps/worker/lib/archiveHandler.ts b/apps/worker/lib/archiveHandler.tsindex 5801a181..004e1f56 100644--- a/apps/worker/lib/archiveHandler.ts+++ b/apps/worker/lib/archiveHandler.ts@@ -12,7 +12,7 @@ import imageHandler from "./preservationScheme/imageHandler";import pdfHandler from "./preservationScheme/pdfHandler";import autoTagLink from "./autoTagLink";import { LinkWithCollectionOwnerAndTags } from "@linkwarden/types";-import { isArchivalTag } from "@linkwarden/lib";+import { isArchivalTag } from "@linkwarden/lib/isArchivalTag";import { ArchivalSettings } from "@linkwarden/types";import { getDefaultContextOptions } from "./browser";diff --git a/apps/worker/lib/autoTagLink.ts b/apps/worker/lib/autoTagLink.tsindex 72bc3932..155ddc3c 100644--- a/apps/worker/lib/autoTagLink.ts+++ b/apps/worker/lib/autoTagLink.ts@@ -16,7 +16,7 @@ import { azure } from "@ai-sdk/azure";import { anthropic } from "@ai-sdk/anthropic";import { createOpenRouter } from "@openrouter/ai-sdk-provider";import { createOllama } from "ollama-ai-provider-v2";-import { titleCase } from "@linkwarden/lib";+import { titleCase } from "@linkwarden/lib/utils";// Function to concat /api with the base URL properlyconst ensureValidURL = (base: string, path: string) =>diff --git a/apps/worker/lib/preservationScheme/handleArchivePreview.ts b/apps/worker/lib/preservationScheme/handleArchivePreview.tsindex fb5108bf..5e3a1bf6 100644--- a/apps/worker/lib/preservationScheme/handleArchivePreview.ts+++ b/apps/worker/lib/preservationScheme/handleArchivePreview.ts@@ -1,6 +1,6 @@import { Collection, Link, User } from "@linkwarden/prisma/client";import { Page } from "playwright";-import { generatePreview } from "@linkwarden/lib";+import { generatePreview } from "@linkwarden/lib/generatePreview";import { createFile } from "@linkwarden/filesystem";import { prisma } from "@linkwarden/prisma";diff --git a/apps/worker/lib/preservationScheme/imageHandler.ts b/apps/worker/lib/preservationScheme/imageHandler.tsindex 0a84968a..ed6f6162 100644--- a/apps/worker/lib/preservationScheme/imageHandler.ts+++ b/apps/worker/lib/preservationScheme/imageHandler.ts@@ -1,7 +1,7 @@import { Link } from "@linkwarden/prisma/client";import { prisma } from "@linkwarden/prisma";import { createFile } from "@linkwarden/filesystem";-import { generatePreview } from "@linkwarden/lib";+import { generatePreview } from "@linkwarden/lib/generatePreview";const imageHandler = async ({ url, id }: Link, extension: string) => {const image = await fetch(url as string).then((res) => res.blob());diff --git a/apps/worker/workers/linkIndexing.ts b/apps/worker/workers/linkIndexing.tsindex d3b9e10b..8bd085ab 100644--- a/apps/worker/workers/linkIndexing.ts+++ b/apps/worker/workers/linkIndexing.ts@@ -1,4 +1,5 @@-import { delay, meiliClient } from "@linkwarden/lib";+import { meiliClient } from "@linkwarden/lib/meilisearchClient";+import { delay } from "@linkwarden/lib/utils";import { prisma } from "@linkwarden/prisma";import getLinkBatch from "../lib/getLinkBatch";import { MEILI_INDEX_VERSION } from "@linkwarden/lib/constants";diff --git a/apps/worker/workers/linkProcessing.ts b/apps/worker/workers/linkProcessing.tsindex 715a5880..80851d77 100644--- a/apps/worker/workers/linkProcessing.ts+++ b/apps/worker/workers/linkProcessing.ts@@ -1,6 +1,6 @@import archiveHandler from "../lib/archiveHandler";import { LinkWithCollectionOwnerAndTags } from "@linkwarden/types";-import { delay } from "@linkwarden/lib";+import { delay } from "@linkwarden/lib/utils";import getLinkBatchFairly from "../lib/getLinkBatchFairly";import { launchBrowser } from "../lib/browser";import { countUnprocessedBillableLinks } from "../lib/countUnprocessedBillableLinks";diff --git a/apps/worker/workers/rssPolling.ts b/apps/worker/workers/rssPolling.tsindex c89e7438..d01c442a 100644--- a/apps/worker/workers/rssPolling.ts+++ b/apps/worker/workers/rssPolling.ts@@ -1,6 +1,7 @@import { prisma } from "@linkwarden/prisma";import Parser from "rss-parser";-import { delay, rssHandler } from "@linkwarden/lib";+import { delay } from "@linkwarden/lib/utils";+import { rssHandler } from "@linkwarden/lib/rssHandler";const pollingIntervalInSeconds =(Number(process.env.NEXT_PUBLIC_RSS_POLLING_INTERVAL_MINUTES) || 60) * 60; // Default to one hour if not setdiff --git a/packages/lib/index.ts b/packages/lib/index.tsdeleted file mode 100644index ceca5870..00000000--- a/packages/lib/index.ts+++ /dev/null@@ -1,6 +0,0 @@-export * from "./rssHandler";-export * from "./verifyCapacity";-export * from "./meilisearchClient";-export * from "./isArchivalTag";-export * from "./generatePreview";-export * from "./utils";