chore: Merge conflicts with master

packages/inventory/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @medusajs/inventory
 
+## 1.0.10
+
+### Patch Changes
+
+- [#3407](https://github.com/medusajs/medusa/pull/3407) [`f0a1355fe`](https://github.com/medusajs/medusa/commit/f0a1355feb5160ff7de1f3d3da769efe29d0d8ed) Thanks [@adrien2p](https://github.com/adrien2p)! - feat(medusa): Bulk emit events
+
+- Updated dependencies [[`601d20e7a`](https://github.com/medusajs/medusa/commit/601d20e7ab293728cd81f0723805841016812120), [`f0a1355fe`](https://github.com/medusajs/medusa/commit/f0a1355feb5160ff7de1f3d3da769efe29d0d8ed)]:
+  - @medusajs/medusa@1.7.13
+
 ## 1.0.9
 
 ### Patch Changes

packages/inventory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/inventory",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Inventory Module for Medusa",
   "main": "dist/index.js",
   "repository": {
@@ -35,7 +35,7 @@
     "test:unit": "jest --passWithNoTests"
   },
   "peerDependencies": {
-    "@medusajs/medusa": "1.7.12",
+    "@medusajs/medusa": "1.7.13",
     "typeorm": "^0.3.11"
   }
 }

packages/inventory/src/services/reservation-item.ts

@@ -269,10 +269,12 @@ export default class ReservationItemService extends TransactionBaseService {
             item.quantity * -1
           ),
       ])
-    })
 
-    await this.eventBusService_.emit(ReservationItemService.Events.DELETED, {
-      id: reservationItemId,
+      await this.eventBusService_
+        .withTransaction(manager)
+        .emit(ReservationItemService.Events.DELETED, {
+        id: reservationItemId,
+      })
     })
   }
 }