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

vholik454055fe351c
diff --git a/packages/admin/package.json b/packages/admin/package.json
index a87aa3b9a..fab97ebc3 100644
--- a/packages/admin/package.json
+++ b/packages/admin/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/admin",
- "version": "2.0.0-canary.68",
+ "version": "2.0.0-canary.69",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bf071848f..8f748ed4d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/cli",
- "version": "2.0.0-canary.68",
+ "version": "2.0.0-canary.69",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/client/package.json b/packages/client/package.json
index e4d7604bf..6b975d4a2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/client",
- "version": "2.0.0-canary.68",
+ "version": "2.0.0-canary.69",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/core-plugin/package.json b/packages/core-plugin/package.json
index 961b82823..d376eaa63 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.68",
+ "version": "2.0.0-canary.69",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/dashboard-sdk/package.json b/packages/dashboard-sdk/package.json
index 390fea30b..8caf1c3e8 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.68",
+ "version": "2.0.0-canary.69",
"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 39be77cd9..df2485e6a 100644
--- a/packages/dashboard-sdk/src/plugin.ts
+++ b/packages/dashboard-sdk/src/plugin.ts
@@ -16,16 +16,37 @@ const UI_MODULE_KEYS = [
"vendor_ui",
]
-function resolvePluginRoot(resolve: string, configDir: string): string | null {
+function findNodeModulesRoot(configDir: string): string {
+ // Walk up from configDir to find the nearest node_modules
+ let dir = configDir
+ while (dir !== path.dirname(dir)) {
+ const candidate = path.join(dir, "node_modules")
+ if (fs.existsSync(candidate) && fs.statSync(candidate).isDirectory()) {
+ return candidate
+ }
+ dir = path.dirname(dir)
+ }
+ return path.join(configDir, "node_modules")
+}
+
+function resolvePluginRoot(resolve: string, configDir: string, nodeModulesRoot: string): string | null {
try {
if (resolve.startsWith(".")) {
- return path.resolve(configDir, resolve)
+ const resolved = path.resolve(configDir, resolve)
+ if (fs.existsSync(resolved)) {
+ return fs.realpathSync(resolved)
+ }
+ return null
+ }
+
+ // Check in node_modules, following symlinks for workspace packages
+ const packagePath = path.join(nodeModulesRoot, resolve)
+ if (!fs.existsSync(packagePath)) {
+ return null
}
- const pkgJsonPath = require.resolve(path.join(resolve, "package.json"), {
- paths: [configDir],
- })
- return path.dirname(pkgJsonPath)
+ // Follow symlinks (handles workspace/linked packages)
+ return fs.realpathSync(packagePath)
} catch {
return null
}
@@ -36,6 +57,7 @@ function resolvePluginDirs(
configDir: string,
appType: "admin" | "vendor"
): string[] {
+ const nodeModulesRoot = findNodeModulesRoot(configDir)
const dirs: string[] = []
for (const plugin of plugins) {
@@ -45,7 +67,7 @@ function resolvePluginDirs(
if (!resolve || typeof resolve !== "string") continue
- const pluginRoot = resolvePluginRoot(resolve, configDir)
+ const pluginRoot = resolvePluginRoot(resolve, configDir, nodeModulesRoot)
if (!pluginRoot) continue
const extDir = path.join(pluginRoot, appType)
diff --git a/packages/dashboard-shared/package.json b/packages/dashboard-shared/package.json
index 7fcba3594..029d8d2b5 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.68",
+ "version": "2.0.0-canary.69",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/types/package.json b/packages/types/package.json
index f8f71d03a..3a3bc4986 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/types",
- "version": "2.0.0-canary.68",
+ "version": "2.0.0-canary.69",
"repository": {
"type": "git",
"url": "https://github.com/mercurjs/mercur",
diff --git a/packages/vendor/package.json b/packages/vendor/package.json
index f2958e961..a06b402ba 100644
--- a/packages/vendor/package.json
+++ b/packages/vendor/package.json
@@ -1,6 +1,6 @@
{
"name": "@mercurjs/vendor",
- "version": "2.0.0-canary.68",
+ "version": "2.0.0-canary.69",
"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 976bc48e6..39772d484 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.68",
- "@mercurjs/dashboard-shared": "2.0.0-canary.68",
- "@mercurjs/admin": "2.0.0-canary.68",
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.69",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.69",
+ "@mercurjs/admin": "2.0.0-canary.69",
"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.68",
+ "@mercurjs/client": "2.0.0-canary.69",
"@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 7c3dd9eb4..b79899e90 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.68",
- "@mercurjs/dashboard-shared": "2.0.0-canary.68",
- "@mercurjs/vendor": "2.0.0-canary.68",
+ "@mercurjs/dashboard-sdk": "2.0.0-canary.69",
+ "@mercurjs/dashboard-shared": "2.0.0-canary.69",
+ "@mercurjs/vendor": "2.0.0-canary.69",
"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.68",
+ "@mercurjs/client": "2.0.0-canary.69",
"@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 e1cc39c94..3d98e58e2 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.68",
- "@mercurjs/types": "2.0.0-canary.68",
+ "@mercurjs/core-plugin": "2.0.0-canary.69",
+ "@mercurjs/types": "2.0.0-canary.69",
"zod": "3.25.76",
"http-proxy-middleware": "^3.0.3"
},