From f5cdd40adba2929a8b94f320819a130b8040eab7 Mon Sep 17 00:00:00 2001 From: Ali Bassiouni Date: Tue, 12 Nov 2024 02:49:37 +0200 Subject: [PATCH] pin drizzle version across packages --- apps/web/package.json | 1 - .../src/app/(authenticated)/success/page.tsx | 1 - apps/web/src/lib/db/db.ts | 5 +- apps/web/src/lib/db/invites.ts | 3 +- apps/web/src/lib/db/signups.ts | 3 +- apps/web/src/lib/db/templates.ts | 3 +- apps/web/src/lib/db/waitlists.ts | 2 +- apps/web/src/lib/db/workspaces.ts | 3 +- apps/workers/package.json | 1 - apps/workers/src/db/index.ts | 2 +- internal/db/package.json | 4 +- internal/db/src/index.ts | 1 + pnpm-lock.yaml | 72 ++++++++++++------- 13 files changed, 59 insertions(+), 42 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 02728a0..97decc8 100644 --- a/apps/web/package.json +++ b/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", diff --git a/apps/web/src/app/(authenticated)/success/page.tsx b/apps/web/src/app/(authenticated)/success/page.tsx index 36df9c9..21ed8bb 100644 --- a/apps/web/src/app/(authenticated)/success/page.tsx +++ b/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"; diff --git a/apps/web/src/lib/db/db.ts b/apps/web/src/lib/db/db.ts index 0f1b328..0cde0dc 100644 --- a/apps/web/src/lib/db/db.ts +++ b/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") { diff --git a/apps/web/src/lib/db/invites.ts b/apps/web/src/lib/db/invites.ts index b8344ed..dcfae75 100644 --- a/apps/web/src/lib/db/invites.ts +++ b/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( diff --git a/apps/web/src/lib/db/signups.ts b/apps/web/src/lib/db/signups.ts index 651a439..67ed387 100644 --- a/apps/web/src/lib/db/signups.ts +++ b/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) { diff --git a/apps/web/src/lib/db/templates.ts b/apps/web/src/lib/db/templates.ts index d3950b6..617610b 100644 --- a/apps/web/src/lib/db/templates.ts +++ b/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"; diff --git a/apps/web/src/lib/db/waitlists.ts b/apps/web/src/lib/db/waitlists.ts index 50f2367..e386e2b 100644 --- a/apps/web/src/lib/db/waitlists.ts +++ b/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"; diff --git a/apps/web/src/lib/db/workspaces.ts b/apps/web/src/lib/db/workspaces.ts index 9eb582b..1ea5c07 100644 --- a/apps/web/src/lib/db/workspaces.ts +++ b/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({ diff --git a/apps/workers/package.json b/apps/workers/package.json index 68ce62a..7ace31f 100644 --- a/apps/workers/package.json +++ b/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" diff --git a/apps/workers/src/db/index.ts b/apps/workers/src/db/index.ts index 5b721ca..bbd3131 100644 --- a/apps/workers/src/db/index.ts +++ b/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; diff --git a/internal/db/package.json b/internal/db/package.json index ad51385..9c344bf 100644 --- a/internal/db/package.json +++ b/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" }, diff --git a/internal/db/src/index.ts b/internal/db/src/index.ts index 533fd4a..a6b0468 100644 --- a/internal/db/src/index.ts +++ b/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"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f6df18..6c1b7cd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -136,9 +136,6 @@ importers: dotenv: specifier: ^16.3.1 version: 16.4.1 - drizzle-orm: - specifier: ^0.33.0 - version: 0.33.0(@cloudflare/workers-types@4.20240512.0)(@neondatabase/serverless@0.6.1)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0) embla-carousel-react: specifier: 8.0.0-rc17 version: 8.0.0-rc17(react@18.2.0) @@ -251,9 +248,6 @@ importers: base-x: specifier: ^4.0.0 version: 4.0.0 - drizzle-orm: - specifier: ^0.33.0 - version: 0.33.0(@cloudflare/workers-types@4.20240512.0)(@neondatabase/serverless@0.7.2)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0) hono: specifier: ^3.12.7 version: 3.12.10 @@ -289,12 +283,12 @@ importers: specifier: ^16.3.1 version: 16.4.1 drizzle-orm: - specifier: ^0.33.0 - version: 0.33.0(@cloudflare/workers-types@4.20240512.0)(@neondatabase/serverless@0.6.1)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0) + specifier: ^0.35.3 + version: 0.35.3(@cloudflare/workers-types@4.20240512.0)(@libsql/client-wasm@0.14.0)(@neondatabase/serverless@0.6.1)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0) devDependencies: drizzle-kit: - specifier: ^0.24.2 - version: 0.24.2 + specifier: ^0.26.2 + version: 0.26.2 tsx: specifier: ^4.7.0 version: 4.7.0 @@ -578,9 +572,11 @@ packages: '@esbuild-kit/core-utils@3.3.2': resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==} + deprecated: 'Merged into tsx: https://tsx.is' '@esbuild-kit/esm-loader@2.6.5': resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==} + deprecated: 'Merged into tsx: https://tsx.is' '@esbuild-plugins/node-globals-polyfill@0.2.3': resolution: {integrity: sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==} @@ -1226,6 +1222,14 @@ packages: '@jridgewell/trace-mapping@0.3.9': resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} + '@libsql/client-wasm@0.14.0': + resolution: {integrity: sha512-gB/jtz0xuwrqAHApBv9e9JSew2030Fhj2edyZ83InZ4yPj/Q2LTUlEhaspEYT0T0xsAGqPy38uGrmq/OGS+DdQ==} + bundledDependencies: + - '@libsql/libsql-wasm-experimental' + + '@libsql/core@0.14.0': + resolution: {integrity: sha512-nhbuXf7GP3PSZgdCY2Ecj8vz187ptHlZQ0VRc751oB2C1W8jQUXKKklvt7t1LJiUTQBVJuadF628eUk+3cRi4Q==} + '@neoconfetti/react@0.1.1': resolution: {integrity: sha512-OqKn/QZYkrCaMBg/a1JTjG1Th0n7YPopIHctqgBi3C34bTV2wbrKJPCIDuNSltsaEpVWjQPbhLYwRpNUMnqhnQ==} @@ -3058,13 +3062,18 @@ packages: resolution: {integrity: sha512-nXOaTSFiuIaTMhS8WJC2d4EBeIcN9OSt2A2cyFbQYBAZbi7lRsVGJNqDpEwPqYfJz38yxbY/UtbvBBahBfnExQ==} hasBin: true - drizzle-orm@0.33.0: - resolution: {integrity: sha512-SHy72R2Rdkz0LEq0PSG/IdvnT3nGiWuRk+2tXZQ90GVq/XQhpCzu/EFT3V2rox+w8MlkBQxifF8pCStNYnERfA==} + drizzle-kit@0.26.2: + resolution: {integrity: sha512-cMq8omEKywjIy5KcqUo6LvEFxkl8/zYHsgYjFVXjmPWWtuW4blcz+YW9+oIhoaALgs2ebRjzXwsJgN9i6P49Dw==} + hasBin: true + + drizzle-orm@0.35.3: + resolution: {integrity: sha512-Uv6N+b36x4BaZlxc96e+ag7RnMapBLGhc4SSi2F7RDwqYJipWjaU/P68RUp1FbW9r+mxoDp8nMz2Eece8PJxfA==} peerDependencies: '@aws-sdk/client-rds-data': '>=3' '@cloudflare/workers-types': '>=3' '@electric-sql/pglite': '>=0.1.1' - '@libsql/client': '*' + '@libsql/client': '>=0.10.0' + '@libsql/client-wasm': '>=0.10.0' '@neondatabase/serverless': '>=0.1' '@op-engineering/op-sqlite': '>=2' '@opentelemetry/api': ^1.4.1 @@ -3693,6 +3702,9 @@ packages: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true + js-base64@3.7.7: + resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==} + js-beautify@1.14.11: resolution: {integrity: sha512-rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw==} engines: {node: '>=14'} @@ -5885,6 +5897,15 @@ snapshots: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + '@libsql/client-wasm@0.14.0': + dependencies: + '@libsql/core': 0.14.0 + js-base64: 3.7.7 + + '@libsql/core@0.14.0': + dependencies: + js-base64: 3.7.7 + '@neoconfetti/react@0.1.1': {} '@neondatabase/serverless@0.6.1': @@ -7707,20 +7728,21 @@ snapshots: transitivePeerDependencies: - supports-color - drizzle-orm@0.33.0(@cloudflare/workers-types@4.20240512.0)(@neondatabase/serverless@0.6.1)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0): - optionalDependencies: - '@cloudflare/workers-types': 4.20240512.0 - '@neondatabase/serverless': 0.6.1 - '@types/pg': 8.6.6 - '@types/react': 18.2.51 - pg: 8.11.3 - postgres: 3.4.3 - react: 18.2.0 + drizzle-kit@0.26.2: + dependencies: + '@drizzle-team/brocli': 0.10.1 + '@esbuild-kit/esm-loader': 2.6.5 + esbuild: 0.19.12 + esbuild-register: 3.6.0(esbuild@0.19.12) + transitivePeerDependencies: + - supports-color - drizzle-orm@0.33.0(@cloudflare/workers-types@4.20240512.0)(@neondatabase/serverless@0.7.2)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0): + drizzle-orm@0.35.3(@cloudflare/workers-types@4.20240512.0)(@libsql/client-wasm@0.14.0)(@neondatabase/serverless@0.6.1)(@types/pg@8.6.6)(@types/react@18.2.51)(pg@8.11.3)(postgres@3.4.3)(react@18.2.0): + dependencies: + '@libsql/client-wasm': 0.14.0 optionalDependencies: '@cloudflare/workers-types': 4.20240512.0 - '@neondatabase/serverless': 0.7.2 + '@neondatabase/serverless': 0.6.1 '@types/pg': 8.6.6 '@types/react': 18.2.51 pg: 8.11.3 @@ -8371,6 +8393,8 @@ snapshots: jiti@1.21.0: {} + js-base64@3.7.7: {} + js-beautify@1.14.11: dependencies: config-chain: 1.1.13