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

vholika955e4e467b6
diff --git a/packages/admin/package.json b/packages/admin/package.json
index 993c83d5b..66525d5e9 100644
--- a/packages/admin/package.json
+++ b/packages/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/admin",
- "version": "2.0.0-canary.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 38dddced2..8c85f4bc4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/cli",
- "version": "2.0.0-canary.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/client/package.json b/packages/client/package.json
index 26e3c5283..cfc7cd3c6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/client",
- "version": "2.0.0-canary.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/package.json b/packages/core-plugin/package.json
index ffd584d22..2804551f7 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.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/src/api/middlewares.ts b/packages/core-plugin/src/api/middlewares.ts
index 458733712..a461535b6 100644
--- a/packages/core-plugin/src/api/middlewares.ts
+++ b/packages/core-plugin/src/api/middlewares.ts
@@ -19,9 +19,8 @@ export default defineMiddlewares({
middlewares: [(req: MedusaRequest, res: MedusaResponse, next: MedusaNextFunction) => {
const service = req.scope.resolve<VendorUIModuleService>(MercurModules.VENDOR_UI)
const options = service.getOptions()
- const path = options.path ?? 'vendor'
- console.log('hello')
- if (options.disable || !req.baseUrl.startsWith(`/${path}`)) {
+ const path = options.path!
+ if (options.disable || !req.baseUrl.startsWith(path)) {
return next()
}
return serveDashboardMiddleware({ path: path, mode: service.getServingMode(), appDir: options.appDir, viteUrl: service.getViteDevServerUrl() })(req, res)
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 d254a1e84..b71d4912d 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,6 +7,7 @@ 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/core-plugin/src/utils/dashboard/dashboard-base.ts b/packages/core-plugin/src/utils/dashboard/dashboard-base.ts
index e68cf50d2..1e17b9748 100644
--- a/packages/core-plugin/src/utils/dashboard/dashboard-base.ts
+++ b/packages/core-plugin/src/utils/dashboard/dashboard-base.ts
@@ -31,7 +31,9 @@ export abstract class DashboardBase {
async onApplicationStart(): Promise<void> {
await this.detectServingMode()
- this.logger.info(`${this.appName} URL → http://localhost:${this.options_.viteDevServerPort}${this.options_.path}`)
+ if (!this.options_.disable) {
+ this.logger.info(`${this.appName} URL → http://localhost:${this.options_.viteDevServerPort}${this.options_.path}`)
+ }
}
onApplicationShutdown(): void {
diff --git a/packages/dashboard-sdk/package.json b/packages/dashboard-sdk/package.json
index 7f380f8df..38fea2284 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.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/dashboard-shared/package.json b/packages/dashboard-shared/package.json
index 4874a92fa..5e909cd46 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.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/types/package.json b/packages/types/package.json
index d1c5b8e76..8bada038b 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/types",
- "version": "2.0.0-canary.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/vendor/package.json b/packages/vendor/package.json
index d65dbb42b..69fa94e58 100644
--- a/packages/vendor/package.json
+++ b/packages/vendor/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/vendor",
- "version": "2.0.0-canary.54",
+ "version": "2.0.0-canary.55",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",