remove --reset-db

Author: dcousens

.changeset/plenty-books-share.md

@@ -0,0 +1,5 @@
+---
+'@keystone-6/core': major
+---
+
+Removes `--reset-db` from `keystone dev`, use `keystone prisma db push --force-reset` to reset your database

docs/pages/docs/guides/cli.md

@@ -129,17 +129,18 @@ We strongly recommend enabling migrations if you are going to run your app in pr
 
 ### Resetting the database
 
-From time to time, in development you may want to reset the database and recreate it from scratch. You can do this by passing the `--reset-db` flag:
+From time to time, in development you may want to reset the database and recreate it from scratch.
+You can do this by using Prisma:
 
 ```bash
-$ keystone dev --reset-db
+$ keystone prisma db push --force-reset
 ```
 
 {% hint kind="error" %}
 Doing this will destroy your database, including all data
 {% /hint %}
 
-This is mainly useful early in a project's development lifecycle, when you want to test database initialisation scripts or create a fresh set of test data.
+This is typically useful early in a project's development lifecycle, when you want to test database initialisation scripts or create a fresh set of test data.
 
 ## postinstall
 

packages/core/src/lib/migrations.ts

@@ -66,7 +66,7 @@ export async function pushPrismaSchemaToDatabase(
   shadowDbUrl: string | undefined,
   schema: string,
   schemaPath: string,
-  resetDb = false
+  resetDb: boolean
 ) {
   const before = Date.now();
   await ensureDatabaseExists(dbUrl, path.dirname(schemaPath));
@@ -181,7 +181,6 @@ export async function deployMigrations(dbUrl: string) {
   });
 }
 
-// TODO: don't have process.exit calls here
 export async function devMigrations(
   dbUrl: string,
   shadowDbUrl: string | undefined,

packages/core/src/scripts/cli.ts

@@ -11,7 +11,6 @@ export type Flags = {
   fix: boolean; // TODO: remove, deprecated
   frozen: boolean;
   prisma: boolean;
-  resetDb: boolean;
   server: boolean;
   ui: boolean;
   withMigrations: boolean;
@@ -82,7 +81,7 @@ export async function cli(cwd: string, argv: string[]) {
   if (command === 'dev') {
     return dev(
       cwd,
-      defaultFlags(flags, { dbPush: true, prisma: true, resetDb: false, server: true, ui: true })
+      defaultFlags(flags, { dbPush: true, prisma: true, server: true, ui: true })
     );
   }
 

packages/core/src/scripts/run/dev.ts

@@ -80,10 +80,9 @@ export async function dev(
   {
     dbPush,
     prisma,
-    resetDb,
     server,
     ui,
-  }: Pick<Flags, 'dbPush' | 'prisma' | 'resetDb' | 'server' | 'ui'>
+  }: Pick<Flags, 'dbPush' | 'prisma' | 'server' | 'ui'>
 ) {
   console.log('✨ Starting Keystone');
   const app = server ? express() : null;
@@ -135,7 +134,6 @@ export async function dev(
       server,
       prisma,
       dbPush,
-      resetDb,
     });
 
     if (configWithHTTP?.server?.extendHttpServer && httpServer && context) {
@@ -375,12 +373,11 @@ async function setupInitialKeystone(
   cwd: string,
   options: {
     dbPush: boolean;
-    resetDb: boolean;
     prisma: boolean;
     server: boolean;
   }
 ) {
-  const { dbPush, resetDb, prisma, server } = options;
+  const { dbPush, prisma, server } = options;
   const { graphQLSchema, adminMeta, getKeystone } = createSystem(config);
 
   // Make local storage folders if used
@@ -403,15 +400,15 @@ async function setupInitialKeystone(
         config.db.shadowDatabaseUrl,
         prismaSchema,
         getSchemaPaths(cwd).prisma,
-        resetDb
+        false
       );
     } else if (dbPush) {
       await pushPrismaSchemaToDatabase(
         config.db.url,
         config.db.shadowDatabaseUrl,
         prismaSchema,
         getSchemaPaths(cwd).prisma,
-        resetDb
+        false
       );
     } else {
       console.log('⚠️ Skipping database schema push');

packages/core/src/scripts/tests/migrations.test.ts

@@ -18,18 +18,16 @@ setSkipWatching();
 const dbUrl = 'file:./app.db';
 
 async function setupAndStopDevServerForMigrations(cwd: string, resetDb: boolean = false) {
-  const stopServer = (await runCommand(
-    cwd,
-    `dev${resetDb ? ' --reset-db' : ''}`
-  )) as () => Promise<void>;
-  await stopServer();
+  if (resetDb) {
+    await ((await runCommand(cwd, 'prisma db push --force-reset')) as () => Promise<void>)();
+  }
+  await (((await runCommand(cwd, 'dev')) as () => Promise<void>)());
 }
 
 function getPrismaClient(cwd: string) {
-  const prismaClient = new (requirePrismaClient(cwd).PrismaClient)({
+  return new (requirePrismaClient(cwd).PrismaClient)({
     datasources: { sqlite: { url: dbUrl } },
   });
-  return prismaClient;
 }
 
 async function getGeneratedMigration(