Merge branch 'develop' into chore/order-dml

medusajs · Jan 21, 2025 · 25f3687 · 25f3687
2 parents f15e15f + cd75806
commit 25f3687
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 12 deletions.
diff --git a/.changeset/light-fireants-attend.md b/.changeset/light-fireants-attend.md
@@ -0,0 +1,5 @@
+---
+"create-medusa-app": patch
+---
+
+fix(create-medusa-app): fix database name from input not used in setup
diff --git a/.changeset/nervous-carrots-draw.md b/.changeset/nervous-carrots-draw.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/medusa": patch
+"@medusajs/framework": patch
+---
+
+fix(framework): migration scripts regexp
diff --git a/packages/cli/create-medusa-app/src/utils/create-db.ts b/packages/cli/create-medusa-app/src/utils/create-db.ts
@@ -224,6 +224,7 @@ export async function getDbClientAndCredentials({
   client: pg.Client
   dbConnectionString: string
   verbose?: boolean
+  dbName?: string
 }> {
   if (dbName) {
     return await getForDbName({

diff --git a/packages/cli/create-medusa-app/src/utils/project-creator/medusa-project-creator.ts b/packages/cli/create-medusa-app/src/utils/project-creator/medusa-project-creator.ts
@@ -104,7 +104,7 @@ export class MedusaProjectCreator
   }
 
   private async setupDatabase(): Promise<void> {
-    const dbName = `medusa-${slugify(this.projectName)}`
+    let dbName = `medusa-${slugify(this.projectName)}`
     const { client, dbConnectionString, ...rest } =
       await getDbClientAndCredentials({
         dbName,
@@ -115,11 +115,12 @@ export class MedusaProjectCreator
     this.client = client
     this.dbConnectionString = dbConnectionString
     this.isDbInitialized = true
+    dbName = rest.dbName || dbName
 
     if (!this.options.dbUrl) {
       this.factBoxOptions.interval = displayFactBox({
         ...this.factBoxOptions,
-        title: "Creating database...",
+        message: "Creating database...",
       })
 
       this.client = await runCreateDb({

diff --git a/packages/core/framework/package.json b/packages/core/framework/package.json
@@ -51,7 +51,7 @@
     "watch": "tsc --watch ",
     "watch:test": "tsc --watch",
     "build": "rimraf dist && tsc --build",
-    "test": "jest --runInBand --bail --passWithNoTests --forceExit"
+    "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts"
   },
   "devDependencies": {
     "@medusajs/cli": "^2.3.1",

diff --git a/packages/core/framework/src/migrations/__fixtures__/project/migration-scripts/test.d.ts b/packages/core/framework/src/migrations/__fixtures__/project/migration-scripts/test.d.ts
diff --git a/packages/core/framework/src/migrations/__fixtures__/project/migration-scripts/test.ts b/packages/core/framework/src/migrations/__fixtures__/project/migration-scripts/test.ts
@@ -0,0 +1,3 @@
+export default function test() {
+  console.log("test")
+}
diff --git a/packages/core/framework/src/migrations/__tests__/run-migration-scripts.spec.ts b/packages/core/framework/src/migrations/__tests__/run-migration-scripts.spec.ts
@@ -1,8 +1,8 @@
-import { MedusaContainer } from "@medusajs/types"
-import { MigrationScriptsMigrator } from "../run-migration-scripts"
 import { jest } from "@jest/globals"
-import path from "path"
+import { MedusaContainer } from "@medusajs/types"
 import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
+import path from "path"
+import { MigrationScriptsMigrator } from "../run-migration-scripts"
 
 const mockPgConnection = {
   raw: jest.fn(),
@@ -171,4 +171,29 @@ describe("MigrationScriptsMigrator", () => {
       )
     })
   })
+
+  describe("loadMigrationFiles", () => {
+    it("should load migration files correctly", async () => {
+      const result = await migrator.loadMigrationFiles([
+        path.join(
+          __dirname,
+          "..",
+          "__fixtures__",
+          "project",
+          "migration-scripts"
+        ),
+      ])
+      expect(result).toHaveLength(1)
+      expect(result[0]).toEqual(
+        path.join(
+          __dirname,
+          "..",
+          "__fixtures__",
+          "project",
+          "migration-scripts",
+          "test.ts"
+        )
+      )
+    })
+  })
 })
diff --git a/packages/core/framework/src/migrations/migrator.ts b/packages/core/framework/src/migrations/migrator.ts
@@ -1,9 +1,9 @@
-import { join } from "path"
+import { MedusaContainer } from "@medusajs/types"
+import { Knex } from "@mikro-orm/knex"
 import { glob } from "glob"
+import { join } from "path"
 import { logger } from "../logger"
-import { MedusaContainer } from "@medusajs/types"
 import { ContainerRegistrationKeys } from "../utils"
-import { Knex } from "@mikro-orm/knex"
 
 export abstract class Migrator {
   protected abstract migration_table_name: string
@@ -135,9 +135,9 @@ export abstract class Migrator {
       }
 
       try {
-        const scriptFiles = glob.sync("*.{js,(!d.)ts}", {
+        const scriptFiles = glob.sync("*.{js,ts}", {
           cwd: basePath,
-          ignore: ["**/index.{js,ts}"],
+          ignore: ["**/index.{js,ts}", "**/*.d.ts"],
         })
 
         if (!scriptFiles?.length) {

diff --git a/packages/medusa/src/commands/plugin/db/generate.ts b/packages/medusa/src/commands/plugin/db/generate.ts
@@ -62,7 +62,7 @@ async function getEntitiesForModule(path: string) {
   const entities = [] as any[]
 
   const entityPaths = glob.sync(join(path, "models", "*.ts"), {
-    ignore: ["**/index.{js,ts}"],
+    ignore: ["**/index.{js,ts}", "**/*.d.ts"],
   })
 
   for (const entityPath of entityPaths) {