create-medusa-app 1.2.1 → 1.2.2-next-20230929123725

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.2.2-next-20230929123725
+
+### Patch Changes
+
+- [#5189](https://github.com/medusajs/medusa/pull/5189) [`18a05dee8`](https://github.com/medusajs/medusa/commit/18a05dee86f55366c92a2669eacbccf526373ff5) Thanks [@shahednasser](https://github.com/shahednasser)! - fix(create-medusa-app): fix inconsistency in checking errors in migrations
+
 ## 1.2.1
 
 ### Patch Changes

package/dist/commands/create.js

@@ -65,7 +65,7 @@ export default async ({ repoUrl = "", seed, boilerplate, skipDb, dbUrl, browser,
     const projectPath = getProjectPath(projectName, directoryPath);
     const adminEmail = !skipDb && migrations ? await askForAdminEmail(seed, boilerplate) : "";
     const installNextjs = withNextjsStarter || (await askForNextjsStarter());
-    const { client, dbConnectionString } = !skipDb
+    let { client, dbConnectionString } = !skipDb
         ? await getDbClientAndCredentials({
             dbName,
             dbUrl,
@@ -107,7 +107,7 @@ export default async ({ repoUrl = "", seed, boilerplate, skipDb, dbUrl, browser,
             ...factBoxOptions,
             title: "Creating database...",
         });
-        await runCreateDb({ client, dbName, spinner });
+        client = await runCreateDb({ client, dbName, spinner });
         factBoxOptions.interval = displayFactBox({
             ...factBoxOptions,
             message: `Database ${dbName} created`,
@@ -131,6 +131,7 @@ export default async ({ repoUrl = "", seed, boilerplate, skipDb, dbUrl, browser,
             migrations,
             onboardingType: installNextjs ? "nextjs" : "default",
             nextjsDirectory,
+            client,
         });
     }
     catch (e) {

package/dist/utils/create-db.js

@@ -8,12 +8,20 @@ export default async function createDb({ client, db }) {
     await client.query(`CREATE DATABASE "${db}"`);
 }
 export async function runCreateDb({ client, dbName, spinner, }) {
-    // create postgres database
+    let newClient = client;
     try {
+        // create postgres database
         await createDb({
             client,
             db: dbName,
         });
+        // create a new connection with database selected
+        await client.end();
+        newClient = await postgresClient({
+            user: client.user,
+            password: client.password,
+            database: dbName,
+        });
     }
     catch (e) {
         spinner.stop();
@@ -22,6 +30,7 @@ export async function runCreateDb({ client, dbName, spinner, }) {
             type: "error",
         });
     }
+    return newClient;
 }
 async function getForDbName(dbName) {
     let client;

package/dist/utils/prepare-project.js

@@ -5,7 +5,7 @@ import promiseExec from "./promise-exec.js";
 import { EOL } from "os";
 import { displayFactBox } from "./facts.js";
 import { clearProject } from "./clear-project.js";
-export default async ({ directory, dbConnectionString, admin, seed, boilerplate, spinner, processManager, abortController, skipDb, migrations, onboardingType = "default", nextjsDirectory = "", }) => {
+export default async ({ directory, dbConnectionString, admin, seed, boilerplate, spinner, processManager, abortController, skipDb, migrations, onboardingType = "default", nextjsDirectory = "", client, }) => {
     // initialize execution options
     const execOptions = {
         cwd: directory,
@@ -97,9 +97,23 @@ export default async ({ directory, dbConnectionString, admin, seed, boilerplate,
         await processManager.runProcess({
             process: async () => {
                 const proc = await promiseExec("npx @medusajs/medusa-cli@latest migrations run", npxOptions);
-                // ensure that migrations actually ran in case of an uncaught error
-                if (!proc.stdout.includes("Migrations completed")) {
-                    throw new Error(`An error occurred while running migrations: ${proc.stderr || proc.stdout}`);
+                if (client) {
+                    // check the migrations table is in the database
+                    // to ensure that migrations ran
+                    let errorOccurred = false;
+                    try {
+                        const migrations = await client.query(`SELECT * FROM "migrations"`);
+                        errorOccurred = migrations.rowCount == 0;
+                    }
+                    catch (e) {
+                        // avoid error thrown if the migrations table
+                        // doesn't exist
+                        errorOccurred = true;
+                    }
+                    // ensure that migrations actually ran in case of an uncaught error
+                    if (errorOccurred) {
+                        throw new Error(`An error occurred while running migrations: ${proc.stderr || proc.stdout}`);
+                    }
                 }
             },
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-medusa-app",
-  "version": "1.2.1",
+  "version": "1.2.2-next-20230929123725",
   "description": "Create a Medusa project using a single command.",
   "type": "module",
   "exports": "./dist/index.js",

package/src/commands/create.ts

@@ -103,7 +103,7 @@ export default async ({
     !skipDb && migrations ? await askForAdminEmail(seed, boilerplate) : ""
   const installNextjs = withNextjsStarter || (await askForNextjsStarter())
 
-  const { client, dbConnectionString } = !skipDb
+  let { client, dbConnectionString } = !skipDb
     ? await getDbClientAndCredentials({
         dbName,
         dbUrl,
@@ -153,7 +153,7 @@ export default async ({
       ...factBoxOptions,
       title: "Creating database...",
     })
-    await runCreateDb({ client, dbName, spinner })
+    client = await runCreateDb({ client, dbName, spinner })
 
     factBoxOptions.interval = displayFactBox({
       ...factBoxOptions,
@@ -179,6 +179,7 @@ export default async ({
       migrations,
       onboardingType: installNextjs ? "nextjs" : "default",
       nextjsDirectory,
+      client,
     })
   } catch (e: any) {
     if (isAbortError(e)) {

package/src/utils/create-db.ts

@@ -24,13 +24,23 @@ export async function runCreateDb({
   client: pg.Client
   dbName: string
   spinner: Ora
-}) {
-  // create postgres database
+}): Promise<pg.Client> {
+  let newClient = client
+
   try {
+    // create postgres database
     await createDb({
       client,
       db: dbName,
     })
+
+    // create a new connection with database selected
+    await client.end()
+    newClient = await postgresClient({
+      user: client.user,
+      password: client.password,
+      database: dbName,
+    })
   } catch (e) {
     spinner.stop()
     logMessage({
@@ -38,6 +48,8 @@ export async function runCreateDb({
       type: "error",
     })
   }
+
+  return newClient
 }
 
 async function getForDbName(dbName: string): Promise<{

package/src/utils/postgres-client.ts

@@ -5,6 +5,7 @@ type PostgresConnection = {
   user?: string
   password?: string
   connectionString?: string
+  database?: string
 }
 
 export default async (connect: PostgresConnection) => {

package/src/utils/prepare-project.ts

@@ -7,6 +7,7 @@ import { EOL } from "os"
 import { displayFactBox, FactBoxOptions } from "./facts.js"
 import ProcessManager from "./process-manager.js"
 import { clearProject } from "./clear-project.js"
+import type { Client } from "pg"
 
 type PrepareOptions = {
   directory: string
@@ -23,6 +24,7 @@ type PrepareOptions = {
   migrations?: boolean
   onboardingType?: "default" | "nextjs"
   nextjsDirectory?: string
+  client: Client | null
 }
 
 export default async ({
@@ -38,6 +40,7 @@ export default async ({
   migrations,
   onboardingType = "default",
   nextjsDirectory = "",
+  client,
 }: PrepareOptions) => {
   // initialize execution options
   const execOptions = {
@@ -145,13 +148,27 @@ export default async ({
           npxOptions
         )
 
-        // ensure that migrations actually ran in case of an uncaught error
-        if (!proc.stdout.includes("Migrations completed")) {
-          throw new Error(
-            `An error occurred while running migrations: ${
-              proc.stderr || proc.stdout
-            }`
-          )
+        if (client) {
+          // check the migrations table is in the database
+          // to ensure that migrations ran
+          let errorOccurred = false
+          try {
+            const migrations = await client.query(`SELECT * FROM "migrations"`)
+            errorOccurred = migrations.rowCount == 0
+          } catch (e) {
+            // avoid error thrown if the migrations table
+            // doesn't exist
+            errorOccurred = true
+          }
+
+          // ensure that migrations actually ran in case of an uncaught error
+          if (errorOccurred) {
+            throw new Error(
+              `An error occurred while running migrations: ${
+                proc.stderr || proc.stdout
+              }`
+            )
+          }
         }
       },
     })

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "ESNext", 
+    "module": "Node16", 
     "moduleResolution": "node16",
     "outDir": "./dist", 
     "esModuleInterop": true,