From 1a8564bc35cc4102fde02af3af1a6073f08fa5d2 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 10 Mar 2024 19:03:15 -0400 Subject: [PATCH] chore: safely import drizzle-kit --- packages/db-postgres/src/createMigration.ts | 5 ++++- packages/db-postgres/src/migrate.ts | 5 ++++- packages/db-postgres/src/utilities/pushDevSchema.ts | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/db-postgres/src/createMigration.ts b/packages/db-postgres/src/createMigration.ts index 04be397b2c..a75730ca04 100644 --- a/packages/db-postgres/src/createMigration.ts +++ b/packages/db-postgres/src/createMigration.ts @@ -3,10 +3,13 @@ import type { DrizzleSnapshotJSON } from 'drizzle-kit/payload' import type { CreateMigration } from 'payload/database' import fs from 'fs' +import { createRequire } from 'module' import prompts from 'prompts' import type { PostgresAdapter } from './types.js' +const require = createRequire(import.meta.url) + const migrationTemplate = ( upSQL?: string, downSQL?: string, @@ -60,7 +63,7 @@ export const createMigration: CreateMigration = async function createMigration( fs.mkdirSync(dir) } - const { generateDrizzleJson, generateMigration } = await import('drizzle-kit/payload') + const { generateDrizzleJson, generateMigration } = require('drizzle-kit/payload') const [yyymmdd, hhmmss] = new Date().toISOString().split('T') const formattedDate = yyymmdd.replace(/\D/g, '') diff --git a/packages/db-postgres/src/migrate.ts b/packages/db-postgres/src/migrate.ts index dfbd6f92d8..5c743fdea9 100644 --- a/packages/db-postgres/src/migrate.ts +++ b/packages/db-postgres/src/migrate.ts @@ -3,6 +3,7 @@ import type { Payload } from 'payload' import type { Migration } from 'payload/database' import type { PayloadRequest } from 'payload/types' +import { createRequire } from 'module' import { commitTransaction, initTransaction, @@ -17,6 +18,8 @@ import { createMigrationTable } from './utilities/createMigrationTable.js' import { migrationTableExists } from './utilities/migrationTableExists.js' import { parseError } from './utilities/parseError.js' +const require = createRequire(import.meta.url) + export async function migrate(this: PostgresAdapter): Promise { const { payload } = this const migrationFiles = await readMigrationFiles({ payload }) @@ -82,7 +85,7 @@ export async function migrate(this: PostgresAdapter): Promise { } async function runMigrationFile(payload: Payload, migration: Migration, batch: number) { - const { generateDrizzleJson } = await import('drizzle-kit/payload') + const { generateDrizzleJson } = require('drizzle-kit/payload') const start = Date.now() const req = { payload } as PayloadRequest diff --git a/packages/db-postgres/src/utilities/pushDevSchema.ts b/packages/db-postgres/src/utilities/pushDevSchema.ts index 949afa9444..55534981ce 100644 --- a/packages/db-postgres/src/utilities/pushDevSchema.ts +++ b/packages/db-postgres/src/utilities/pushDevSchema.ts @@ -1,10 +1,13 @@ import { eq } from 'drizzle-orm' import { numeric, timestamp, varchar } from 'drizzle-orm/pg-core' +import { createRequire } from 'module' import prompts from 'prompts' import type { PostgresAdapter } from '../types.js' -const { pushSchema } = await import('drizzle-kit/payload') +const require = createRequire(import.meta.url) + +const { pushSchema } = require('drizzle-kit/payload') /** * Pushes the development schema to the database using Drizzle.