Merge branch 'develop' into feat/cookie-options

Author: thetutlage

.changeset/big-olives-do.md

@@ -0,0 +1,10 @@
+---
+"@medusajs/utils": patch
+"@medusajs/auth": patch
+"@medusajs/customer": patch
+"@medusajs/fulfillment": patch
+"@medusajs/inventory": patch
+"@medusajs/payment": patch
+---
+
+fix(utils): medusa internal service returned data should match typings

.changeset/cold-cats-cheat.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/medusa": patch
+"@medusajs/test-utils": patch
+"@medusajs/framework": patch
+"@medusajs/utils": patch
+---
+
+chore(): Add retry strategy to database connection

.changeset/loud-ducks-do.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/dashboard": patch
+"@medusajs/types": patch
+---
+
+feat(dashboard,types): add credit lines + loyalty changes

.changeset/shy-nails-enjoy.md

@@ -0,0 +1,5 @@
+---
+"create-medusa-app": patch
+---
+
+fix(create-medusa-app): ensure the same package manager is used consistently

.changeset/sour-tigers-press.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/framework": patch
+---
+
+chore: upgrade to use glob 10

.changeset/stale-forks-cover.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/payment": patch
+---
+
+fix(payment): add account holder methods to the manual provider

integration-tests/api/jest.config.js

@@ -4,7 +4,6 @@ process.chdir(__dirname)
 const defineJestConfig = require("../../define_jest_config")
 module.exports = defineJestConfig({
   testEnvironment: `node`,
-  rootDir: "./",
   testPathIgnorePatterns: [
     `/examples/`,
     `/www/`,

integration-tests/api/package.json

@@ -5,8 +5,8 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --silent=false --no-cache --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage",
-    "test:integration:chunk": "NODE_OPTIONS=--experimental-vm-modules jest --silent --no-cache --bail --maxWorkers=50% --forceExit --detectOpenHandles --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")",
+    "test:integration": "jest --silent=false --no-cache --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage",
+    "test:integration:chunk": "jest --silent --no-cache --bail --maxWorkers=50% --forceExit --detectOpenHandles --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")",
     "build": "tsc ./src/* --allowJs --outDir ./dist"
   },
   "dependencies": {

integration-tests/http/__tests__/order/admin/order.spec.ts

@@ -30,6 +30,44 @@ medusaIntegrationTestRunner({
       ).data.shipping_profile
     })
 
+    describe("GET /admin/orders", () => {
+      beforeEach(async () => {
+        seeder = await createOrderSeeder({
+          api,
+          container: getContainer(),
+        })
+        order = seeder.order
+      })
+
+      it("should search orders by display_id", async () => {
+        let response = await api.get(`/admin/orders`, adminHeaders)
+
+        expect(response.data.orders).toHaveLength(1)
+        expect(response.data.orders).toEqual([
+          expect.objectContaining({
+            id: order.id,
+          }),
+        ])
+
+        response = await api.get(
+          `/admin/orders?q=${order.display_id}`,
+          adminHeaders
+        )
+
+        expect(response.data.orders).toHaveLength(1)
+        expect(response.data.orders).toEqual([
+          expect.objectContaining({
+            id: order.id,
+          }),
+        ])
+
+        response = await api.get(`/admin/orders?q=2345`, adminHeaders)
+
+        expect(response.data.orders).toHaveLength(0)
+        expect(response.data.orders).toEqual([])
+      })
+    })
+
     describe("POST /orders/:id", () => {
       beforeEach(async () => {
         seeder = await createOrderSeeder({

integration-tests/http/jest.config.js

@@ -2,7 +2,6 @@ process.chdir(__dirname)
 const defineJestConfig = require("../../define_jest_config")
 module.exports = defineJestConfig({
   testEnvironment: `node`,
-  rootDir: "./",
   testPathIgnorePatterns: [
     `/examples/`,
     `/www/`,