diff --git a/bun.lock b/bun.lock index 155809f..f20c79d 100644 --- a/bun.lock +++ b/bun.lock @@ -8,11 +8,25 @@ "@types/bun": "latest", }, }, + "packages/convex": { + "name": "@fileone/convex", + "peerDependencies": { + "convex": "^1.27.0", + "typescript": "^5", + }, + }, + "packages/path": { + "name": "@fileone/path", + "peerDependencies": { + "typescript": "^5", + }, + }, "packages/web": { "name": "@fileone/web", "version": "0.1.0", "dependencies": { "@convex-dev/workos": "^0.0.1", + "@fileone/convex": "workspace:*", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-context-menu": "^2.2.16", "@radix-ui/react-dialog": "^1.1.15", @@ -180,6 +194,10 @@ "@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.4", "", { "os": "win32", "cpu": "x64" }, "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ=="], + "@fileone/convex": ["@fileone/convex@workspace:packages/convex"], + + "@fileone/path": ["@fileone/path@workspace:packages/path"], + "@fileone/web": ["@fileone/web@workspace:packages/web"], "@floating-ui/core": ["@floating-ui/core@1.7.3", "", { "dependencies": { "@floating-ui/utils": "^0.2.10" } }, "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w=="], diff --git a/convex/_generated/api.d.ts b/packages/convex/_generated/api.d.ts similarity index 100% rename from convex/_generated/api.d.ts rename to packages/convex/_generated/api.d.ts diff --git a/convex/_generated/api.js b/packages/convex/_generated/api.js similarity index 100% rename from convex/_generated/api.js rename to packages/convex/_generated/api.js diff --git a/convex/_generated/dataModel.d.ts b/packages/convex/_generated/dataModel.d.ts similarity index 100% rename from convex/_generated/dataModel.d.ts rename to packages/convex/_generated/dataModel.d.ts diff --git a/convex/_generated/server.d.ts b/packages/convex/_generated/server.d.ts similarity index 100% rename from convex/_generated/server.d.ts rename to packages/convex/_generated/server.d.ts diff --git a/convex/_generated/server.js b/packages/convex/_generated/server.js similarity index 100% rename from convex/_generated/server.js rename to packages/convex/_generated/server.js diff --git a/convex/auth.config.ts b/packages/convex/auth.config.ts similarity index 100% rename from convex/auth.config.ts rename to packages/convex/auth.config.ts diff --git a/convex/files.ts b/packages/convex/files.ts similarity index 97% rename from convex/files.ts rename to packages/convex/files.ts index c371940..dd10e9c 100644 --- a/convex/files.ts +++ b/packages/convex/files.ts @@ -1,4 +1,4 @@ -import type { Id } from "@convex/_generated/dataModel" +import type { Id } from "@fileone/convex/_generated/dataModel" import { v } from "convex/values" import { authenticatedMutation, authenticatedQuery } from "./functions" import type { DirectoryItem } from "./model/directories" diff --git a/convex/functions.ts b/packages/convex/functions.ts similarity index 100% rename from convex/functions.ts rename to packages/convex/functions.ts diff --git a/convex/model/directories.ts b/packages/convex/model/directories.ts similarity index 98% rename from convex/model/directories.ts rename to packages/convex/model/directories.ts index 91c0da4..c60a523 100644 --- a/convex/model/directories.ts +++ b/packages/convex/model/directories.ts @@ -1,4 +1,4 @@ -import type { Doc, Id } from "@convex/_generated/dataModel" +import type { Doc, Id } from "@fileone/convex/_generated/dataModel" import type { AuthenticatedMutationCtx, AuthenticatedQueryCtx, diff --git a/convex/model/error.ts b/packages/convex/model/error.ts similarity index 100% rename from convex/model/error.ts rename to packages/convex/model/error.ts diff --git a/convex/model/user.ts b/packages/convex/model/user.ts similarity index 100% rename from convex/model/user.ts rename to packages/convex/model/user.ts diff --git a/packages/convex/package.json b/packages/convex/package.json new file mode 100644 index 0000000..d736178 --- /dev/null +++ b/packages/convex/package.json @@ -0,0 +1,9 @@ +{ + "name": "@fileone/convex", + "module": "index.ts", + "type": "module", + "peerDependencies": { + "typescript": "^5", + "convex": "^1.27.0" + } +} diff --git a/convex/schema.ts b/packages/convex/schema.ts similarity index 100% rename from convex/schema.ts rename to packages/convex/schema.ts diff --git a/convex/users.ts b/packages/convex/users.ts similarity index 100% rename from convex/users.ts rename to packages/convex/users.ts diff --git a/packages/web/package.json b/packages/web/package.json index f926ebc..1fa076b 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@convex-dev/workos": "^0.0.1", + "@fileone/convex": "workspace:*", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-context-menu": "^2.2.16", "@radix-ui/react-dialog": "^1.1.15", @@ -42,4 +43,4 @@ "@types/react": "^19", "@types/react-dom": "^19" } -} \ No newline at end of file +} diff --git a/packages/web/src/files/file-table.tsx b/packages/web/src/files/file-table.tsx index 80eff64..5c7b44d 100644 --- a/packages/web/src/files/file-table.tsx +++ b/packages/web/src/files/file-table.tsx @@ -1,6 +1,5 @@ -import { api } from "@convex/_generated/api" -import type { Id } from "@convex/_generated/dataModel" -import type { DirectoryItem } from "@convex/model/directories" +import { api } from "@fileone/convex/_generated/api" +import type { DirectoryItem } from "@fileone/convex/model/directories" import { useMutation } from "@tanstack/react-query" import { type ColumnDef, diff --git a/packages/web/src/files/files-page.tsx b/packages/web/src/files/files-page.tsx index df1cfa1..aace853 100644 --- a/packages/web/src/files/files-page.tsx +++ b/packages/web/src/files/files-page.tsx @@ -1,4 +1,4 @@ -import { api } from "@convex/_generated/api" +import { api } from "@fileone/convex/_generated/api" import { useMutation } from "@tanstack/react-query" import { useMutation as useConvexMutation } from "convex/react" import { useSetAtom } from "jotai" diff --git a/packages/web/src/files/state.ts b/packages/web/src/files/state.ts index 5379e42..043d119 100644 --- a/packages/web/src/files/state.ts +++ b/packages/web/src/files/state.ts @@ -1,9 +1,9 @@ -import { atom } from "jotai" -import type { Id } from "@convex/_generated/dataModel" +import type { Id } from "@fileone/convex/_generated/dataModel" import type { DirectoryItem, DirectoryItemKind, -} from "@convex/model/directories" +} from "@fileone/convex/model/directories" +import { atom } from "jotai" export const contextMenuTargeItemAtom = atom(null) export const optimisticDeletedItemsAtom = atom( diff --git a/packages/web/src/lib/error.ts b/packages/web/src/lib/error.ts index 6f271ea..ff576aa 100644 --- a/packages/web/src/lib/error.ts +++ b/packages/web/src/lib/error.ts @@ -1,5 +1,8 @@ +import { + Code as ErrorCode, + isApplicationError, +} from "@fileone/convex/model/error" import { toast } from "sonner" -import { Code as ErrorCode, isApplicationError } from "@convex/model/error" const ERROR_MESSAGE = { [ErrorCode.DirectoryExists]: "Directory already exists", diff --git a/packages/web/src/routes/login_.callback.tsx b/packages/web/src/routes/login_.callback.tsx index de4ae41..d02a9e9 100644 --- a/packages/web/src/routes/login_.callback.tsx +++ b/packages/web/src/routes/login_.callback.tsx @@ -1,4 +1,4 @@ -import { api } from "@convex/_generated/api" +import { api } from "@fileone/convex/_generated/api" import { useMutation } from "@tanstack/react-query" import { createFileRoute, useNavigate } from "@tanstack/react-router" import { useConvexAuth, useMutation as useConvexMutation } from "convex/react" diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index f61a786..3fa7ced 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -23,8 +23,7 @@ "baseUrl": ".", "paths": { - "@/*": ["./src/*"], - "@convex/*": ["../../convex/*"] + "@/*": ["./src/*"] }, // Some stricter flags (disabled by default)