Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Rewrite migrations with zx like api (#2085)
Bogdan Chadkin85f205a6198b
diff --git a/packages/prisma-client/migrations-cli/commands.ts b/packages/prisma-client/migrations-cli/commands.tsindex cfa7cdca1e..e84fc69479 100644--- a/packages/prisma-client/migrations-cli/commands.ts+++ b/packages/prisma-client/migrations-cli/commands.ts@@ -141,8 +141,8 @@ const isNoopSql = (sqlScript: string) => {);};-const ensureNoChangesInPrismaSchema = () => {- const sqlScript = prismaMigrations.cliDiff();+const ensureNoChangesInPrismaSchema = async () => {+ const sqlScript = await prismaMigrations.cliDiff();if (isNoopSql(sqlScript ?? "") === false) {throw new UserError("There are changes in schema.prisma. Please create a schema migration first."@@ -159,7 +159,7 @@ export const createSchema = async ({ name }: { name: string }) => {// We need the database to be up to date before we can do a diff.ensureNoPending(status);- const sqlScript = prismaMigrations.cliDiff();+ const sqlScript = await prismaMigrations.cliDiff();if (isNoopSql(sqlScript ?? "")) {logger.info("No changes to apply");@@ -186,7 +186,7 @@ export const createData = async ({ name }: { name: string }) => {ensureNoFailed(status);ensureNoPending(status);- ensureNoChangesInPrismaSchema();+ await ensureNoChangesInPrismaSchema();const migrationName = prismaMigrations.generateMigrationName(name);@@ -216,7 +216,7 @@ ${schemaContent}`;writeFile(schemaFilePath, schemaContent);logger.info(`Created: ${schemaFilePath}`);- prismaMigrations.generateMigrationClient(migrationName);+ await prismaMigrations.generateMigrationClient(migrationName);logger.info(`Created: ${path.join(prismaMigrations.migrationsDir,diff --git a/packages/prisma-client/migrations-cli/prisma-migrations.ts b/packages/prisma-client/migrations-cli/prisma-migrations.tsindex 58d1c82fa4..7c8a95af5d 100644--- a/packages/prisma-client/migrations-cli/prisma-migrations.ts+++ b/packages/prisma-client/migrations-cli/prisma-migrations.ts@@ -2,7 +2,7 @@// We want to preserve semantics of the migrations folder and the _prisma_migrations table.// https://github.com/prisma/prisma-engines/blob/4.3.0/migration-engine/ARCHITECTURE.md-import { execaSync } from "execa";+import { $ } from "execa";import path from "node:path";import fs from "node:fs";import { fileURLToPath } from "node:url";@@ -223,55 +223,29 @@ export const generateMigrationName = (baseName: string) => {};export const resetDatabase = async () => {- const sqlToDeleteEverything = execaSync("prisma", [- "migrate",- "diff",- "--from-schema-datasource",- schemaFilePath,- "--to-empty",- "--script",- ]).stdout;-- execaSync(- "prisma",- ["db", "execute", "--stdin", "--schema", schemaFilePath],- { input: sqlToDeleteEverything }- );+ const { stdout: sqlToDeleteEverything } =+ await $`"prisma migrate diff --from-schema-datasource ${schemaFilePath} --to-empty --script`;++ await $({+ input: sqlToDeleteEverything,+ })`prisma db execute --stdin --schema ${schemaFilePath}`;await prisma.$executeRaw`DROP TABLE IF EXISTS _prisma_migrations`;};// https://www.prisma.io/docs/reference/api-reference/command-reference#migrate-diff-export const cliDiff = () => {- return execaSync("prisma", [- "migrate",- "diff",- "--from-schema-datasource",- schemaFilePath,- "--to-schema-datamodel",- schemaFilePath,- "--script",- ]).stdout;-};--// https://www.prisma.io/docs/reference/api-reference/command-reference#generate-export const cliGenerate = (schemaPath: string) => {- return execaSync("prisma", ["generate", "--schema", schemaPath]);+export const cliDiff = async () => {+ const { stdout } =+ await $`prisma migrate diff --from-schema-datasource ${schemaFilePath} --to-schema-datamodel ${schemaFilePath} --script`;+ return stdout;};// https://www.prisma.io/docs/reference/api-reference/command-reference#db-execute-export const cliExecute = (filePath: string) => {- return execaSync("prisma", [- "db",- "execute",- "--file",- filePath,- "--schema",- schemaFilePath,- ]);+export const cliExecute = async (filePath: string) => {+ await $`prisma db execute --file ${filePath} --schema ${schemaFilePath}`;};-export const generateMigrationClient = (migrationName: string) => {+export const generateMigrationClient = async (migrationName: string) => {const migrationDir = path.join(migrationsDir, migrationName);const schemaPath = path.join(migrationDir, "schema.prisma");@@ -291,5 +265,6 @@ export const generateMigrationClient = (migrationName: string) => {fs.rmSync(clientPath, { recursive: true });}- cliGenerate(schemaPath);+ // https://www.prisma.io/docs/reference/api-reference/command-reference#generate+ await $`prisma generate --schema ${schemaPath}`;};diff --git a/packages/prisma-client/migrations-cli/umzug.ts b/packages/prisma-client/migrations-cli/umzug.tsindex 41e341a780..147b78cc8c 100755--- a/packages/prisma-client/migrations-cli/umzug.ts+++ b/packages/prisma-client/migrations-cli/umzug.ts@@ -25,7 +25,7 @@ export const umzug = new Umzug({...params,up: async () => {await prismaMigrations.setStarted(params.name, sqlFilePath);- prismaMigrations.cliExecute(sqlFilePath);+ await prismaMigrations.cliExecute(sqlFilePath);},};}@@ -34,7 +34,7 @@ export const umzug = new Umzug({return {...params,up: async () => {- prismaMigrations.generateMigrationClient(params.name);+ await prismaMigrations.generateMigrationClient(params.name);// eslint-disable-next-line @typescript-eslint/no-var-requiresconst migration = await import(tsFilePath);diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.jsonindex 09c1aaa0ed..960e2089fd 100644--- a/packages/prisma-client/package.json+++ b/packages/prisma-client/package.json@@ -37,7 +37,7 @@"dependencies": {"@inquirer/confirm": "^0.0.25-alpha.0","dotenv": "^16.3.1",- "execa": "^6.1.0",+ "execa": "^7.2.0","nanoid": "^4.0.2","umzug": "^3.2.1"},diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 3a568c9878..98fc18f688 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1066,8 +1066,8 @@ importers:specifier: ^16.3.1version: 16.3.1execa:- specifier: ^6.1.0- version: 6.1.0+ specifier: ^7.2.0+ version: 7.2.0nanoid:specifier: ^4.0.2version: 4.0.2@@ -9836,6 +9836,22 @@ packages:onetime: 6.0.0signal-exit: 3.0.7strip-final-newline: 3.0.0+ dev: true++ resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}+ engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}+ dependencies:+ cross-spawn: 7.0.3+ get-stream: 6.0.1+ human-signals: 4.3.1+ is-stream: 3.0.0+ merge-stream: 2.0.0+ npm-run-path: 5.1.0+ onetime: 6.0.0+ signal-exit: 3.0.7+ strip-final-newline: 3.0.0+ dev: falseresolution: {integrity: sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==}@@ -10684,6 +10700,12 @@ packages:resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}engines: {node: '>=12.20.0'}+ dev: true++ resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}+ engines: {node: '>=14.18.0'}+ dev: falseresolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}