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.70

vholik680a920b92fb
diff --git a/packages/admin/package.json b/packages/admin/package.json
index fab97ebc3..2c8474208 100644
--- a/packages/admin/package.json
+++ b/packages/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/admin",
- "version": "2.0.0-canary.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8f748ed4d..bf50ec5ec 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/cli",
- "version": "2.0.0-canary.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/client/package.json b/packages/client/package.json
index 6b975d4a2..dd538c467 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/client",
- "version": "2.0.0-canary.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/package.json b/packages/core-plugin/package.json
index d376eaa63..e4c229709 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.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/dashboard-sdk/package.json b/packages/dashboard-sdk/package.json
index 8caf1c3e8..27ef59452 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.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/dashboard-sdk/src/plugin.ts b/packages/dashboard-sdk/src/plugin.ts
index df2485e6a..c6a96677a 100644
--- a/packages/dashboard-sdk/src/plugin.ts
+++ b/packages/dashboard-sdk/src/plugin.ts
@@ -55,10 +55,10 @@ function resolvePluginRoot(resolve: string, configDir: string, nodeModulesRoot:
function resolvePluginDirs(
plugins: any[],
configDir: string,
- appType: "admin" | "vendor"
): string[] {
const nodeModulesRoot = findNodeModulesRoot(configDir)
const dirs: string[] = []
+ const appTypes = ["admin", "vendor"] as const
for (const plugin of plugins) {
const resolve = typeof plugin === "string"
@@ -70,9 +70,11 @@ function resolvePluginDirs(
const pluginRoot = resolvePluginRoot(resolve, configDir, nodeModulesRoot)
if (!pluginRoot) continue
- const extDir = path.join(pluginRoot, appType)
- if (fs.existsSync(extDir) && fs.statSync(extDir).isDirectory()) {
- dirs.push(extDir)
+ for (const appType of appTypes) {
+ const extDir = path.join(pluginRoot, '.medusa/server/src', appType)
+ if (fs.existsSync(extDir) && fs.statSync(extDir).isDirectory()) {
+ dirs.push(extDir)
+ }
}
}
@@ -88,7 +90,6 @@ async function loadMedusaConfig(medusaConfigPath: string, root: string): Promise
const configDir = path.dirname(medusaConfigPath)
let base: string | undefined
- let appType: "admin" | "vendor" | undefined
for (const key of UI_MODULE_KEYS) {
const value = modules[key]
@@ -98,15 +99,12 @@ async function loadMedusaConfig(medusaConfigPath: string, root: string): Promise
if (appDir === root) {
base = value.options.path
- appType = key === "admin_ui" ? "admin" : "vendor"
break
}
}
const plugins = medusaConfig?.plugins ?? []
- const pluginDirs = appType
- ? resolvePluginDirs(plugins, configDir, appType)
- : []
+ const pluginDirs = resolvePluginDirs(plugins, configDir)
return { base, pluginDirs }
} catch {
diff --git a/packages/dashboard-shared/package.json b/packages/dashboard-shared/package.json
index 029d8d2b5..529a55ed2 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.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/types/package.json b/packages/types/package.json
index 3a3bc4986..887142ef7 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/types",
- "version": "2.0.0-canary.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/vendor/package.json b/packages/vendor/package.json
index a06b402ba..8e5b0c191 100644
--- a/packages/vendor/package.json
+++ b/packages/vendor/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/vendor",
- "version": "2.0.0-canary.69",
+ "version": "2.0.0-canary.70",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/templates/basic/apps/admin/package.json b/templates/basic/apps/admin/package.json
index 39772d484..4a1980387 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.69",
- "@mercurjs/dashboard-shared": "2.0.0-canary.69",
- "@mercurjs/admin": "2.0.0-canary.69",
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.70",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.70",
+ "@mercurjs/admin": "2.0.0-canary.70",
"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.69",
+ "@mercurjs/client": "2.0.0-canary.70",
"@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 b79899e90..a84d2acd3 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.69",
- "@mercurjs/dashboard-shared": "2.0.0-canary.69",
- "@mercurjs/vendor": "2.0.0-canary.69",
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.70",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.70",
+ "@mercurjs/vendor": "2.0.0-canary.70",
"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.69",
+ "@mercurjs/client": "2.0.0-canary.70",
"@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 3d98e58e2..210ceefdc 100644
--- a/templates/basic/packages/api/package.json
+++ b/templates/basic/packages/api/package.json
@@ -36,8 +36,8 @@
"@medusajs/admin-shared": "^2.13.3",
"@medusajs/medusa": "^2.13.3",
"@medusajs/draft-order": "2.13.3",
- "@mercurjs/core-plugin": "2.0.0-canary.69",
- "@mercurjs/types": "2.0.0-canary.69",
+ "@mercurjs/core-plugin": "2.0.0-canary.70",
+ "@mercurjs/types": "2.0.0-canary.70",
"zod": "3.25.76",
"http-proxy-middleware": "^3.0.3"
},