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

vholik6178e2a5c49d
diff --git a/packages/admin/package.json b/packages/admin/package.json
index 2311cc5a2..5d3865bb7 100644
--- a/packages/admin/package.json
+++ b/packages/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/admin",
- "version": "2.0.0-canary.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3753bb60b..3d8aea3a3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/cli",
- "version": "2.0.0-canary.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/client/package.json b/packages/client/package.json
index 50699bd3e..a30c88de1 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/client",
- "version": "2.0.0-canary.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/package.json b/packages/core-plugin/package.json
index 4b45a460b..78aedb5f0 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.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/src/modules/vendor-ui/services/vendor-ui-module-service.ts b/packages/core-plugin/src/modules/vendor-ui/services/vendor-ui-module-service.ts
index b71d4912d..d254a1e84 100644
--- a/packages/core-plugin/src/modules/vendor-ui/services/vendor-ui-module-service.ts
+++ b/packages/core-plugin/src/modules/vendor-ui/services/vendor-ui-module-service.ts
@@ -7,7 +7,6 @@ export default class VendorUIModuleService extends DashboardBase {
constructor(container, options: DashboardModuleOptions) {
super(container, {
...options,
- path: options.path ?? '/hub',
viteDevServerPort: options.viteDevServerPort ?? 7001
})
}
diff --git a/packages/dashboard-sdk/package.json b/packages/dashboard-sdk/package.json
index cc2f41c85..929625cf8 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.61",
+ "version": "2.0.0-canary.62",
"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 30ecd937c..ccb1603cc 100644
--- a/packages/dashboard-sdk/src/plugin.ts
+++ b/packages/dashboard-sdk/src/plugin.ts
@@ -11,11 +11,11 @@ function isPageFile(file: string): boolean {
}
const UI_MODULE_KEYS = [
- "@mercurjs/core-plugin/modules/admin-ui",
- "@mercurjs/core-plugin/modules/vendor-ui",
+ "admin_ui",
+ "vendor_ui",
]
-async function loadMedusaConfig(medusaConfigPath: string, root: string): Promise<{ backendUrl: string; base?: string }> {
+async function loadMedusaConfig(medusaConfigPath: string, root: string): Promise<{ base?: string }> {
try {
const mod = await getFileExports(medusaConfigPath)
const medusaConfig = mod.default ?? mod
@@ -30,15 +30,14 @@ async function loadMedusaConfig(medusaConfigPath: string, root: string): Promise
if (appDir === root) {
return {
- backendUrl: value.options.backendUrl ?? "http://localhost:9000",
base: value.options.path,
}
}
}
- return { backendUrl: "http://localhost:9000" }
+ return {}
} catch {
- return { backendUrl: "http://localhost:9000" }
+ return {}
}
}
@@ -52,9 +51,10 @@ export function mercurDashboardPlugin(pluginConfig: MercurConfig): Vite.Plugin {
root = viteConfig.root || process.cwd()
const medusaConfigPath = path.resolve(root, pluginConfig.medusaConfigPath)
- const { backendUrl, base } = await loadMedusaConfig(medusaConfigPath, root)
+ const { base } = await loadMedusaConfig(medusaConfigPath, root)
const srcDir = path.join(root, "src")
+ const backendUrl = pluginConfig.backendUrl ?? "http://localhost:9000"
config = {
...pluginConfig,
diff --git a/packages/dashboard-sdk/src/types.ts b/packages/dashboard-sdk/src/types.ts
index f3ac23e5b..3b3b1e78d 100644
--- a/packages/dashboard-sdk/src/types.ts
+++ b/packages/dashboard-sdk/src/types.ts
@@ -2,6 +2,7 @@ import { ComponentType } from "react";
export interface MercurConfig {
medusaConfigPath: string
+ backendUrl?: string
name?: string
logo?: string
components?: {
diff --git a/packages/dashboard-shared/package.json b/packages/dashboard-shared/package.json
index 3cd080c71..e4d647a9d 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.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/types/package.json b/packages/types/package.json
index efd78be9c..696042f31 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/types",
- "version": "2.0.0-canary.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/types/src/dashboard/index.ts b/packages/types/src/dashboard/index.ts
index e31699550..facfd2e82 100644
--- a/packages/types/src/dashboard/index.ts
+++ b/packages/types/src/dashboard/index.ts
@@ -3,8 +3,7 @@ export type ServingMode = "vite-proxy" | "static" | "default-page"
export interface DashboardModuleOptions {
disable?: boolean
name: string
- path?: string
- backendUrl?: string
+ path: string
appDir: string
viteDevServerPort?: number
viteDevServerHost?: string
diff --git a/packages/vendor/package.json b/packages/vendor/package.json
index 4cfb485e8..fa37c720e 100644
--- a/packages/vendor/package.json
+++ b/packages/vendor/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/vendor",
- "version": "2.0.0-canary.61",
+ "version": "2.0.0-canary.62",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/templates/basic/packages/api/medusa-config.ts b/templates/basic/packages/api/medusa-config.ts
index ed53382c4..83095285f 100644
--- a/templates/basic/packages/api/medusa-config.ts
+++ b/templates/basic/packages/api/medusa-config.ts
@@ -22,7 +22,10 @@ module.exports = defineConfig({
modules: [
{
resolve: '@mercurjs/core-plugin/modules/vendor-ui',
- options: { appDir: path.join(__dirname, 'apps/vendor'), } as DashboardModuleOptions
+ options: {
+ appDir: path.join(__dirname, '../../apps/vendor'),
+ path: '/hub'
+ } as DashboardModuleOptions
}
],
plugins: [{