Merge remote-tracking branch 'origin/master' into develop

packages/medusa/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.61](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.60...@medusajs/medusa@1.1.61) (2021-12-29)
+
+**Note:** Version bump only for package @medusajs/medusa
+
+
+
+
+
 ## [1.1.60](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.59...@medusajs/medusa@1.1.60) (2021-12-17)
 
 

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.1.60",
+  "version": "1.1.61",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "bin": {
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^16.1.8",
-    "@medusajs/medusa-cli": "^1.1.25",
+    "@medusajs/medusa-cli": "^1.1.26",
     "@types/lodash": "^4.14.168",
     "awilix": "^4.2.3",
     "body-parser": "^1.19.0",
@@ -73,7 +73,7 @@
     "joi-objectid": "^3.0.1",
     "jsonwebtoken": "^8.5.1",
     "medusa-core-utils": "^1.1.31",
-    "medusa-test-utils": "^1.1.35",
+    "medusa-test-utils": "^1.1.36",
     "morgan": "^1.9.1",
     "multer": "^1.4.2",
     "passport": "^0.4.0",

packages/medusa/src/api/routes/admin/invites/index.ts

@@ -4,15 +4,15 @@ import { DeleteResponse } from "../../../../types/common"
 import middlewares from "../../../middlewares"
 import "reflect-metadata"
 
-const route = Router()
-
 export const unauthenticatedInviteRoutes = (app) => {
+  const route = Router()
   app.use("/invites", route)
 
   route.post("/accept", middlewares.wrap(require("./accept-invite").default))
 }
 
 export default (app) => {
+  const route = Router()
   app.use("/invites", route)
 
   route.get("/", middlewares.wrap(require("./list-invites").default))

packages/medusa/src/api/routes/admin/users/index.ts

@@ -1,11 +1,10 @@
 import { Router } from "express"
-import _ from "lodash"
 import { User } from "../../../.."
 import { DeleteResponse } from "../../../../types/common"
 import middlewares from "../../../middlewares"
-const route = Router()
 
 export const unauthenticatedUserRoutes = (app) => {
+  const route = Router()
   app.use("/users", route)
 
   route.post(
@@ -20,6 +19,7 @@ export const unauthenticatedUserRoutes = (app) => {
 }
 
 export default (app) => {
+  const route = Router()
   app.use("/users", route)
 
   route.get("/:user_id", middlewares.wrap(require("./get-user").default))