pin drizzle version across packages

apps/web/package.json

@@ -45,7 +45,6 @@
     "clsx": "^2.0.0",
     "csv": "^6.3.6",
     "dotenv": "^16.3.1",
-    "drizzle-orm": "^0.33.0",
     "embla-carousel-react": "8.0.0-rc17",
     "framer-motion": "^11.2.6",
     "isomorphic-dompurify": "^2.3.0",

apps/web/src/app/(authenticated)/success/page.tsx

@@ -8,7 +8,6 @@ import { clerkClient, currentUser } from "@clerk/nextjs";
 import type { Workspace } from "@entrybase/db";
 import { workspaces } from "@entrybase/db";
 import { newId } from "@entrybase/id";
-import { eq } from "drizzle-orm";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import React from "react";

apps/web/src/lib/db/db.ts

@@ -1,9 +1,8 @@
 import "server-only";
 
-import { email_templates, invites, signups, waitlists, workspaces } from "@entrybase/db";
+import { drizzle, email_templates, invites, signups, waitlists, workspaces } from "@entrybase/db";
 import { neon, neonConfig } from "@neondatabase/serverless";
-import { drizzle } from "drizzle-orm/neon-http";
-import { dbEnv, env } from "../env";
+import { dbEnv } from "../env";
 
 neonConfig.fetchConnectionCache = true;
 if (process.env.NODE_ENV === "development") {

apps/web/src/lib/db/invites.ts

@@ -1,6 +1,5 @@
-import { invites, signups } from "@entrybase/db";
+import { and, desc, eq, inArray, invites, signups } from "@entrybase/db";
 import { newId } from "@entrybase/id";
-import { and, desc, eq, inArray } from "drizzle-orm";
 import { db } from "./db";
 
 export async function createInvite(

apps/web/src/lib/db/signups.ts

@@ -1,8 +1,7 @@
 import "server-only";
 
 import type { DBResult, Entry, EntryResponse } from "@/types";
-import { signups } from "@entrybase/db";
-import { and, asc, desc, eq, sql } from "drizzle-orm";
+import { and, asc, desc, eq, signups, sql } from "@entrybase/db";
 import { db } from "./db";
 
 export async function getInvitesListByCount(selectionMethod: string, count: number, waitlistID: string) {

apps/web/src/lib/db/templates.ts

@@ -1,8 +1,7 @@
 import "server-only";
 
-import { email_templates } from "@entrybase/db";
+import { and, email_templates, eq } from "@entrybase/db";
 import { newId } from "@entrybase/id";
-import { and, eq } from "drizzle-orm";
 import { unstable_noStore as noStore } from "next/cache";
 import { db } from "./db";
 

apps/web/src/lib/db/waitlists.ts

@@ -1,6 +1,6 @@
 import { waitlists } from "@entrybase/db";
+import { and, desc, eq, isNotNull, isNull } from "@entrybase/db";
 import { newId } from "@entrybase/id";
-import { and, desc, eq, isNotNull, isNull } from "drizzle-orm";
 import { unstable_noStore as noStore, revalidatePath } from "next/cache";
 import { utapi } from "../uploadthing/server";
 import { selectRandomTwColor } from "../utils";

apps/web/src/lib/db/workspaces.ts

@@ -1,8 +1,7 @@
 import { db } from "./db";
 
-import { type Workspace, workspaces } from "@entrybase/db";
+import { type Workspace, and, eq, isNull, workspaces } from "@entrybase/db";
 import { newId } from "@entrybase/id";
-import { and, eq, isNull } from "drizzle-orm";
 
 export async function getWorkspaceForTenant(tenantID: string) {
   const workspace = await db.query.workspaces.findFirst({

apps/workers/package.json

@@ -10,7 +10,6 @@
     "@entrybase/id": "workspace:^",
     "@neondatabase/serverless": "^0.7.2",
     "base-x": "^4.0.0",
-    "drizzle-orm": "^0.33.0",
     "hono": "^3.12.7",
     "typescript": "^5.3.3",
     "zod": "^3.22.4"

apps/workers/src/db/index.ts

@@ -1,6 +1,6 @@
+import { type NeonHttpDatabase, drizzle } from "@entrybase/db";
 import * as schema from "@entrybase/db/src/schema";
 import { neon, neonConfig } from "@neondatabase/serverless";
-import { type NeonHttpDatabase, drizzle } from "drizzle-orm/neon-http";
 
 export let db: NeonHttpDatabase<typeof schema>;
 

internal/db/package.json

@@ -14,10 +14,10 @@
     "@neondatabase/serverless": "^0.6.0",
     "@types/node": "^20.11.5",
     "dotenv": "^16.3.1",
-    "drizzle-orm": "^0.33.0"
+    "drizzle-orm": "^0.35.3"
   },
   "devDependencies": {
-    "drizzle-kit": "^0.24.2",
+    "drizzle-kit": "^0.26.2",
     "tsx": "^4.7.0",
     "typescript": "^5.2.2"
   },

internal/db/src/index.ts

@@ -6,3 +6,4 @@ export * from "./schema/invites";
 export * from "./schema/workspaces";
 
 export * from "drizzle-orm";
+export { drizzle, type NeonHttpDatabase } from "drizzle-orm/neon-http";