From 6747a497fc759cbcc2667dcc14c0ae89b30689ca Mon Sep 17 00:00:00 2001 From: Waleed Date: Thu, 18 Sep 2025 11:04:06 -0700 Subject: [PATCH] fix(migrations): upgrade drizzle-kit in migrations container (#1374) * fix(migrations): upgrade drizzle-kit in migrations container * fix comments * rm unused file --- apps/sim/test-self-hosting.ts | 22 ---------------------- bun.lock | 10 +++++----- docker/db.Dockerfile | 5 ++--- package.json | 6 +++--- packages/db/package.json | 4 ++-- 5 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 apps/sim/test-self-hosting.ts diff --git a/apps/sim/test-self-hosting.ts b/apps/sim/test-self-hosting.ts deleted file mode 100644 index 2e664a568..000000000 --- a/apps/sim/test-self-hosting.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { createApiKey } from './lib/api-key/auth' - -console.log('=== Testing self-hosting scenario (no API_ENCRYPTION_KEY) ===') - -// Check environment -console.log('ENCRYPTION_KEY:', `${process.env.ENCRYPTION_KEY?.slice(0, 10)}...`) -console.log('API_ENCRYPTION_KEY:', process.env.API_ENCRYPTION_KEY) - -// Ensure API_ENCRYPTION_KEY is not set -process.env.API_ENCRYPTION_KEY = undefined -console.log('API_ENCRYPTION_KEY after delete:', process.env.API_ENCRYPTION_KEY) - -try { - const result = await createApiKey(true) - console.log('Key generated:', !!result.key) - console.log('Encrypted key generated:', !!result.encryptedKey) - console.log('Encrypted key value:', result.encryptedKey) - console.log('Are they the same?', result.key === result.encryptedKey) - console.log('Would validation pass?', !!result.encryptedKey) -} catch (error) { - console.error('Error in createApiKey:', error) -} diff --git a/bun.lock b/bun.lock index 0ea9db503..408c4672a 100644 --- a/bun.lock +++ b/bun.lock @@ -8,7 +8,7 @@ "@t3-oss/env-nextjs": "0.13.4", "@vercel/analytics": "1.5.0", "bcryptjs": "3.0.2", - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "geist": "^1.4.2", "mongodb": "6.19.0", "postgres": "^3.4.5", @@ -21,7 +21,7 @@ "@biomejs/biome": "2.0.0-beta.5", "@next/env": "15.4.1", "@types/bcryptjs": "3.0.0", - "drizzle-kit": "^0.31.1", + "drizzle-kit": "^0.31.4", "husky": "9.1.7", "lint-staged": "16.0.0", "turbo": "2.5.6", @@ -224,7 +224,7 @@ "typescript": "^5.7.3", }, "peerDependencies": { - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "postgres": "^3.4.5", }, }, @@ -247,7 +247,7 @@ ], "overrides": { "@next/env": "15.4.1", - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "next": "15.4.1", "postgres": "^3.4.5", "react": "19.1.0", @@ -1980,7 +1980,7 @@ "drizzle-kit": ["drizzle-kit@0.31.4", "", { "dependencies": { "@drizzle-team/brocli": "^0.10.2", "@esbuild-kit/esm-loader": "^2.5.5", "esbuild": "^0.25.4", "esbuild-register": "^3.5.0" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-tCPWVZWZqWVx2XUsVpJRnH9Mx0ClVOf5YUHerZ5so1OKSlqww4zy1R5ksEdGRcO3tM3zj0PYN6V48TbQCL1RfA=="], - "drizzle-orm": ["drizzle-orm@0.41.0", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-7A4ZxhHk9gdlXmTdPj/lREtP+3u8KvZ4yEN6MYVxBzZGex5Wtdc+CWSbu7btgF6TB0N+MNPrvW7RKBbxJchs/Q=="], + "drizzle-orm": ["drizzle-orm@0.44.5", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@tidbcloud/serverless": "*", "@types/better-sqlite3": "*", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=7", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "knex": "*", "kysely": "*", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@tidbcloud/serverless", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "knex", "kysely", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-jBe37K7d8ZSKptdKfakQFdeljtu3P2Cbo7tJoJSVZADzIKOBo9IAJPOmMsH2bZl90bZgh8FQlD8BjxXA/zuBkQ=="], "duck": ["duck@0.1.12", "", { "dependencies": { "underscore": "^1.13.1" } }, "sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg=="], diff --git a/docker/db.Dockerfile b/docker/db.Dockerfile index 1e90bc301..681cd138f 100644 --- a/docker/db.Dockerfile +++ b/docker/db.Dockerfile @@ -8,9 +8,8 @@ WORKDIR /app COPY package.json bun.lock turbo.json ./ COPY packages/db/package.json ./packages/db/package.json -# Install minimal dependencies in one layer -RUN bun install --omit dev --ignore-scripts && \ - bun install --omit dev --ignore-scripts drizzle-kit drizzle-orm postgres +# Install dependencies +RUN bun install --ignore-scripts # ======================================== # Runner Stage: Production Environment diff --git a/package.json b/package.json index c81f4b154..3e4b55fdd 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "react-dom": "19.1.0", "next": "15.4.1", "@next/env": "15.4.1", - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "postgres": "^3.4.5" }, "dependencies": { @@ -38,7 +38,7 @@ "@t3-oss/env-nextjs": "0.13.4", "@vercel/analytics": "1.5.0", "bcryptjs": "3.0.2", - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "geist": "^1.4.2", "mongodb": "6.19.0", "postgres": "^3.4.5", @@ -51,7 +51,7 @@ "@biomejs/biome": "2.0.0-beta.5", "@next/env": "15.4.1", "@types/bcryptjs": "3.0.0", - "drizzle-kit": "^0.31.1", + "drizzle-kit": "^0.31.4", "husky": "9.1.7", "lint-staged": "16.0.0", "turbo": "2.5.6" diff --git a/packages/db/package.json b/packages/db/package.json index e4f689b86..2c0299745 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -25,14 +25,14 @@ "type-check": "tsc --noEmit" }, "peerDependencies": { - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "postgres": "^3.4.5" }, "devDependencies": { "typescript": "^5.7.3" }, "overrides": { - "drizzle-orm": "^0.41.0", + "drizzle-orm": "^0.44.5", "postgres": "^3.4.5" } }