Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

chore: v2.0.0-canary.91

Jakub Sieradzki1d36d2aa20a4
diff --git a/packages/admin/package.json b/packages/admin/package.json
index 8ec2cba8c..66facac99 100644
--- a/packages/admin/package.json
+++ b/packages/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/admin",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
@@ -29,8 +29,8 @@
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
},
"dependencies": {
- "@mercurjs/dashboard-shared": "2.0.0-canary.90",
- "@mercurjs/client": "2.0.0-canary.90",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.91",
+ "@mercurjs/client": "2.0.0-canary.91",
"@ariakit/react": "^0.4.15",
"@babel/runtime": "^7.26.10",
"@dnd-kit/core": "^6.1.0",
diff --git a/packages/admin/src/hooks/api/invites.tsx b/packages/admin/src/hooks/api/invites.tsx
index 6e14cfd92..391f4dee9 100644
--- a/packages/admin/src/hooks/api/invites.tsx
+++ b/packages/admin/src/hooks/api/invites.tsx
@@ -10,7 +10,7 @@ import {
useMutation,
useQuery,
} from "@tanstack/react-query"
-import { sdk } from "../../lib/client"
+import { sdk, fetchQuery } from "../../lib/client"
import { queryClient } from "../../lib/query-client"
import { queryKeysFactory } from "../../lib/query-key-factory"
@@ -114,31 +114,25 @@ export const useDeleteInvite = (
})
}
+type AcceptInvitePayload = {
+ email?: string | null
+ first_name?: string | null
+ last_name?: string | null
+ auth_token: string
+}
+
export const useAcceptInvite = (
inviteToken: string,
- options?: UseMutationOptions<
- InferClientOutput<typeof sdk.admin.invites.accept.mutate>,
- ClientError,
- Omit<
- InferClientInput<typeof sdk.admin.invites.accept.mutate>,
- "invite_token"
- > & { auth_token: string }
- >
+ options?: UseMutationOptions<{ user: unknown }, ClientError, AcceptInvitePayload>
) => {
return useMutation({
- mutationFn: (payload) => {
- const { auth_token, ...rest } = payload
-
- return sdk.admin.invites.accept.mutate({
- invite_token: inviteToken,
- ...rest,
- fetchOptions: {
- headers: {
- Authorization: `Bearer ${auth_token}`,
- },
- },
- })
- },
+ mutationFn: ({ auth_token, ...body }) =>
+ fetchQuery('/admin/invites/accept', {
+ method: 'POST',
+ query: { token: inviteToken },
+ body,
+ headers: { Authorization: `Bearer ${auth_token}` },
+ }),
onSuccess: (data, variables, context) => {
options?.onSuccess?.(data, variables, context)
},
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d127a11bc..7f6c19f3f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/cli",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
@@ -63,7 +63,7 @@
"vite": "^5.4.21",
"@medusajs/admin-bundler": "2.13.3",
"@medusajs/framework": "2.13.3",
- "@mercurjs/dashboard-sdk": "2.0.0-canary.90"
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.91"
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
diff --git a/packages/client/package.json b/packages/client/package.json
index f2962942e..6e36adbb5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/client",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/.mercur/_generated/index.ts b/packages/core-plugin/.mercur/_generated/index.ts
index 40cc5344c..603cf95e3 100644
--- a/packages/core-plugin/.mercur/_generated/index.ts
+++ b/packages/core-plugin/.mercur/_generated/index.ts
@@ -142,7 +142,6 @@ export type Routes = {
$id: typeof import("@medusajs/medusa/api/admin/invites/[id]/route") & {
resend: typeof import("@medusajs/medusa/api/admin/invites/[id]/resend/route");
};
- accept: typeof import("../../src/api/admin/invites/accept/route");
};
locales: typeof import("@medusajs/medusa/api/admin/locales/route") & {
$code: typeof import("@medusajs/medusa/api/admin/locales/[code]/route");
diff --git a/packages/core-plugin/package.json b/packages/core-plugin/package.json
index 9ae150eed..891119dc1 100644
--- a/packages/core-plugin/package.json
+++ b/packages/core-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/core-plugin",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/src/api/admin/invites/accept/route.ts b/packages/core-plugin/src/api/admin/invites/accept/route.ts
deleted file mode 100644
index e98d1afe4..000000000
--- a/packages/core-plugin/src/api/admin/invites/accept/route.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { acceptInviteWorkflow } from "@medusajs/core-flows"
-import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework/http"
-import { MedusaError } from "@medusajs/framework/utils"
-import { HttpTypes } from "@medusajs/framework/types"
-
-type AcceptInviteBody = {
- invite_token: string
- email?: string | null
- first_name?: string | null
- last_name?: string | null
-}
-
-export const POST = async (
- req: AuthenticatedMedusaRequest<AcceptInviteBody>,
- res: MedusaResponse<HttpTypes.AdminAcceptInviteResponse>
-) => {
- if (req.auth_context.actor_id) {
- throw new MedusaError(
- MedusaError.Types.INVALID_DATA,
- "The user is already authenticated and cannot accept an invite."
- )
- }
-
- const input = {
- invite_token: req.validatedBody.invite_token,
- auth_identity_id: req.auth_context.auth_identity_id,
- user: {
- email: req.validatedBody.email ?? undefined,
- first_name: req.validatedBody.first_name ?? undefined,
- last_name: req.validatedBody.last_name ?? undefined,
- },
- }
-
- let users
- try {
- const { result } = await acceptInviteWorkflow(req.scope).run({ input })
- users = result
- } catch (e) {
- res.status(401).json({ message: "Unauthorized" })
- return
- }
-
- res.status(200).json({ user: users[0] })
-}
-
-export const AUTHENTICATE = false
diff --git a/packages/dashboard-sdk/package.json b/packages/dashboard-sdk/package.json
index 12f955801..58f04668a 100644
--- a/packages/dashboard-sdk/package.json
+++ b/packages/dashboard-sdk/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/dashboard-sdk",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/dashboard-shared/package.json b/packages/dashboard-shared/package.json
index 9a65feb54..1bb14536c 100644
--- a/packages/dashboard-shared/package.json
+++ b/packages/dashboard-shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/dashboard-shared",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
@@ -23,7 +23,7 @@
"build": "tsup"
},
"dependencies": {
- "@mercurjs/client": "2.0.0-canary.90",
+ "@mercurjs/client": "2.0.0-canary.91",
"@ariakit/react": "^0.4.15",
"@babel/runtime": "^7.26.10",
"@dnd-kit/core": "^6.1.0",
diff --git a/packages/types/package.json b/packages/types/package.json
index 63c5043a1..8e7b2cf6c 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/types",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/vendor/package.json b/packages/vendor/package.json
index 2db139d4b..2dc01c15d 100644
--- a/packages/vendor/package.json
+++ b/packages/vendor/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/vendor",
- "version": "2.0.0-canary.90",
+ "version": "2.0.0-canary.91",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
@@ -29,8 +29,8 @@
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
},
"dependencies": {
- "@mercurjs/dashboard-shared": "2.0.0-canary.90",
- "@mercurjs/client": "2.0.0-canary.90",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.91",
+ "@mercurjs/client": "2.0.0-canary.91",
"@ariakit/react": "^0.4.15",
"@babel/runtime": "^7.26.10",
"@dnd-kit/core": "^6.1.0",
diff --git a/templates/basic/apps/admin/package.json b/templates/basic/apps/admin/package.json
index 643ff33b0..f2275ddfb 100644
--- a/templates/basic/apps/admin/package.json
+++ b/templates/basic/apps/admin/package.json
@@ -11,16 +11,16 @@
},
"dependencies": {
"@medusajs/icons": "^2.13.3",
- "@mercurjs/dashboard-sdk": "2.0.0-canary.90",
- "@mercurjs/dashboard-shared": "2.0.0-canary.90",
- "@mercurjs/admin": "2.0.0-canary.90",
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.91",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.91",
+ "@mercurjs/admin": "2.0.0-canary.91",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-i18next": "13.5.0",
"@tanstack/react-query": "5.64.2",
"@medusajs/ui": "4.1.1",
"react-router-dom": "6.30.3",
- "@mercurjs/client": "2.0.0-canary.90",
+ "@mercurjs/client": "2.0.0-canary.91",
"@acme/api": "*",
"@tanstack/react-table": "8.20.5",
"react-hook-form": "7.49.1",
diff --git a/templates/basic/apps/vendor/package.json b/templates/basic/apps/vendor/package.json
index b40d07ed6..97764df8d 100644
--- a/templates/basic/apps/vendor/package.json
+++ b/templates/basic/apps/vendor/package.json
@@ -11,16 +11,16 @@
},
"dependencies": {
"@medusajs/icons": "^2.13.3",
- "@mercurjs/dashboard-sdk": "2.0.0-canary.90",
- "@mercurjs/dashboard-shared": "2.0.0-canary.90",
- "@mercurjs/vendor": "2.0.0-canary.90",
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.91",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.91",
+ "@mercurjs/vendor": "2.0.0-canary.91",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-i18next": "13.5.0",
"@tanstack/react-query": "5.64.2",
"@medusajs/ui": "4.1.1",
"react-router-dom": "6.30.3",
- "@mercurjs/client": "2.0.0-canary.90",
+ "@mercurjs/client": "2.0.0-canary.91",
"@acme/api": "*",
"@tanstack/react-table": "8.20.5",
"react-hook-form": "7.49.1",
diff --git a/templates/basic/packages/api/package.json b/templates/basic/packages/api/package.json
index 5cd03d185..ab784584f 100644
--- a/templates/basic/packages/api/package.json
+++ b/templates/basic/packages/api/package.json
@@ -34,11 +34,11 @@
"@medusajs/admin-shared": "^2.13.3",
"@medusajs/medusa": "^2.13.3",
"@medusajs/draft-order": "2.13.3",
- "@mercurjs/core-plugin": "2.0.0-canary.90",
- "@mercurjs/types": "2.0.0-canary.90",
+ "@mercurjs/core-plugin": "2.0.0-canary.91",
+ "@mercurjs/types": "2.0.0-canary.91",
"zod": "3.25.76",
"http-proxy-middleware": "^3.0.3",
- "@mercurjs/cli": "2.0.0-canary.90"
+ "@mercurjs/cli": "2.0.0-canary.91"
},
"devDependencies": {
"@medusajs/test-utils": "^2.13.3",