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

vholikab7955607397
diff --git a/packages/admin/package.json b/packages/admin/package.json
index e4251880a..1e122f6e8 100644
--- a/packages/admin/package.json
+++ b/packages/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/admin",
- "version": "2.0.0-canary.85",
+ "version": "2.0.0-canary.86",
"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.85",
- "@mercurjs/client": "2.0.0-canary.85",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.86",
+ "@mercurjs/client": "2.0.0-canary.86",
"@ariakit/react": "^0.4.15",
"@babel/runtime": "^7.26.10",
"@dnd-kit/core": "^6.1.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5070e65ca..a5512e167 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/cli",
- "version": "2.0.0-canary.85",
+ "version": "2.0.0-canary.86",
"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.85"
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.86"
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
diff --git a/packages/client/package.json b/packages/client/package.json
index f03ba98aa..cc65e152a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/client",
- "version": "2.0.0-canary.85",
+ "version": "2.0.0-canary.86",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/package.json b/packages/core-plugin/package.json
index 920d8b5a3..a5f82a1de 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.85",
+ "version": "2.0.0-canary.86",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/dashboard-sdk/package.json b/packages/dashboard-sdk/package.json
index 91b269d6e..2248001a8 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.85",
+ "version": "2.0.0-canary.86",
"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 392f81fea..f9814cd39 100644
--- a/packages/dashboard-sdk/src/plugin.ts
+++ b/packages/dashboard-sdk/src/plugin.ts
@@ -57,10 +57,9 @@ function resolvePluginRoot(
}
}
-function resolvePluginExtensions(plugins: any[], configDir: string): string[] {
+function resolvePluginExtensions(plugins: any[], configDir: string, appType: "admin" | "vendor"): string[] {
const nodeModulesRoot = findNodeModulesRoot(configDir);
const extensions: string[] = [];
- const appTypes = ["admin", "vendor"] as const;
for (const plugin of plugins) {
const resolve = typeof plugin === "string" ? plugin : plugin?.resolve;
@@ -70,16 +69,14 @@ function resolvePluginExtensions(plugins: any[], configDir: string): string[] {
const pluginRoot = resolvePluginRoot(resolve, configDir, nodeModulesRoot);
if (!pluginRoot) continue;
- for (const appType of appTypes) {
- const extFile = path.join(
- pluginRoot,
- ".medusa/server/src",
- appType,
- "index.mjs",
- );
- if (fs.existsSync(extFile)) {
- extensions.push(extFile);
- }
+ const extFile = path.join(
+ pluginRoot,
+ ".medusa/server/src",
+ appType,
+ "index.mjs",
+ );
+ if (fs.existsSync(extFile)) {
+ extensions.push(extFile);
}
}
@@ -98,6 +95,7 @@ async function loadMedusaConfig(
const configDir = path.dirname(medusaConfigPath);
let base: string | undefined;
+ let appType: "admin" | "vendor" = "admin";
for (const key of UI_MODULE_KEYS) {
const value = modules[key];
@@ -108,16 +106,14 @@ async function loadMedusaConfig(
if (appDir === root) {
base = value.options.path;
+ appType = key === "vendor_ui" ? "vendor" : "admin";
break;
}
}
const plugins =
- medusaConfig?.plugins?.filter(
- (plugin: { resolve: string }) =>
- plugin.resolve !== "@medusajs/draft-order",
- ) ?? [];
- const pluginExtensions = resolvePluginExtensions(plugins, configDir);
+ medusaConfig?.plugins ?? [];
+ const pluginExtensions = resolvePluginExtensions(plugins, configDir, appType);
return { base, pluginExtensions };
} catch {
diff --git a/packages/dashboard-shared/package.json b/packages/dashboard-shared/package.json
index 2c34320ee..8f3b1b8e0 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.85",
+ "version": "2.0.0-canary.86",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
@@ -23,7 +23,7 @@
"build": "tsup"
},
"dependencies": {
- "@mercurjs/client": "2.0.0-canary.85",
+ "@mercurjs/client": "2.0.0-canary.86",
"@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 0a99e4604..6bdc3616a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/types",
- "version": "2.0.0-canary.85",
+ "version": "2.0.0-canary.86",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/vendor/package.json b/packages/vendor/package.json
index 74950af87..33e6f020e 100644
--- a/packages/vendor/package.json
+++ b/packages/vendor/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/vendor",
- "version": "2.0.0-canary.85",
+ "version": "2.0.0-canary.86",
"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.85",
- "@mercurjs/client": "2.0.0-canary.85",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.86",
+ "@mercurjs/client": "2.0.0-canary.86",
"@ariakit/react": "^0.4.15",
"@babel/runtime": "^7.26.10",
"@dnd-kit/core": "^6.1.0",