@mercurjs/dashboard-sdk 2.3.2-canary.2 → 2.3.2-canary.4

package/dist/vite.cjs

@@ -364,7 +364,7 @@ function generateRoutes({ srcDir, pluginExtensions }) {
     }
   }
   const pluginDeclarations = pluginExtensions.map(
-    (ext, i) => `const __plugin${i} = (await import("${normalizePath(ext)}")).default`
+    (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
   );
   const pluginSpreads = pluginExtensions.map(
     (_, i) => `    ...(__plugin${i}.routeModule?.routes ?? [])`
@@ -581,7 +581,7 @@ function generateMenuItems({ srcDir, pluginExtensions }) {
     }
   }
   const pluginDeclarations = pluginExtensions.map(
-    (ext, i) => `const __plugin${i} = (await import("${normalizePath(ext)}")).default`
+    (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
   );
   const pluginSpreads = pluginExtensions.map(
     (_, i) => `        ...(__plugin${i}.menuItemModule?.menuItems ?? [])`
@@ -744,7 +744,7 @@ function generateWidgets({
 }) {
   const { imports, entries: widgetEntries } = collectWidgets(srcDir);
   const pluginDeclarations = pluginExtensions.map(
-    (ext, i) => `const __plugin${i} = (await import("${normalizePath(ext)}")).default`
+    (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
   );
   const pluginSpreads = pluginExtensions.map(
     (_, i) => `    ...(__plugin${i}.widgetModule?.widgets ?? [])`
@@ -928,19 +928,34 @@ function findNodeModulesRoot(configDir) {
   return import_path8.default.join(configDir, "node_modules");
 }
 function resolvePluginRoot(resolve, configDir, nodeModulesRoot) {
-  try {
-    if (resolve.startsWith(".")) {
+  if (resolve.startsWith(".")) {
+    try {
       const resolved = import_path8.default.resolve(configDir, resolve);
-      if (import_fs7.default.existsSync(resolved)) {
-        return import_fs7.default.realpathSync(resolved);
-      }
+      return import_fs7.default.existsSync(resolved) ? import_fs7.default.realpathSync(resolved) : null;
+    } catch {
       return null;
     }
-    const packagePath = import_path8.default.join(nodeModulesRoot, resolve);
-    if (!import_fs7.default.existsSync(packagePath)) {
-      return null;
+  }
+  const require2 = (0, import_module.createRequire)(import_path8.default.join(configDir, "noop.js"));
+  try {
+    return import_fs7.default.realpathSync(
+      import_path8.default.dirname(require2.resolve(`${resolve}/package.json`))
+    );
+  } catch {
+  }
+  try {
+    let dir = import_path8.default.dirname(require2.resolve(resolve));
+    while (dir !== import_path8.default.dirname(dir)) {
+      if (import_fs7.default.existsSync(import_path8.default.join(dir, "package.json"))) {
+        return import_fs7.default.realpathSync(dir);
+      }
+      dir = import_path8.default.dirname(dir);
     }
-    return import_fs7.default.realpathSync(packagePath);
+  } catch {
+  }
+  try {
+    const packagePath = import_path8.default.join(nodeModulesRoot, resolve);
+    return import_fs7.default.existsSync(packagePath) ? import_fs7.default.realpathSync(packagePath) : null;
   } catch {
     return null;
   }
@@ -952,7 +967,12 @@ function resolvePluginExtensions(plugins, configDir, appType) {
     const resolve = typeof plugin === "string" ? plugin : plugin?.resolve;
     if (!resolve || typeof resolve !== "string") continue;
     const pluginRoot = resolvePluginRoot(resolve, configDir, nodeModulesRoot);
-    if (!pluginRoot) continue;
+    if (!pluginRoot) {
+      console.warn(
+        `[@mercurjs/dashboard-sdk] Could not resolve plugin "${resolve}" from ${configDir}. Its ${appType} extensions will be missing from the build.`
+      );
+      continue;
+    }
     const extFile = import_path8.default.join(
       pluginRoot,
       ".medusa/server/src",

package/dist/vite.js

@@ -344,7 +344,7 @@ function generateRoutes({ srcDir, pluginExtensions }) {
     }
   }
   const pluginDeclarations = pluginExtensions.map(
-    (ext, i) => `const __plugin${i} = (await import("${normalizePath(ext)}")).default`
+    (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
   );
   const pluginSpreads = pluginExtensions.map(
     (_, i) => `    ...(__plugin${i}.routeModule?.routes ?? [])`
@@ -561,7 +561,7 @@ function generateMenuItems({ srcDir, pluginExtensions }) {
     }
   }
   const pluginDeclarations = pluginExtensions.map(
-    (ext, i) => `const __plugin${i} = (await import("${normalizePath(ext)}")).default`
+    (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
   );
   const pluginSpreads = pluginExtensions.map(
     (_, i) => `        ...(__plugin${i}.menuItemModule?.menuItems ?? [])`
@@ -724,7 +724,7 @@ function generateWidgets({
 }) {
   const { imports, entries: widgetEntries } = collectWidgets(srcDir);
   const pluginDeclarations = pluginExtensions.map(
-    (ext, i) => `const __plugin${i} = (await import("${normalizePath(ext)}")).default`
+    (ext, i) => `import __plugin${i} from "${normalizePath(ext)}"`
   );
   const pluginSpreads = pluginExtensions.map(
     (_, i) => `    ...(__plugin${i}.widgetModule?.widgets ?? [])`
@@ -908,19 +908,34 @@ function findNodeModulesRoot(configDir) {
   return path8.join(configDir, "node_modules");
 }
 function resolvePluginRoot(resolve, configDir, nodeModulesRoot) {
-  try {
-    if (resolve.startsWith(".")) {
+  if (resolve.startsWith(".")) {
+    try {
       const resolved = path8.resolve(configDir, resolve);
-      if (fs7.existsSync(resolved)) {
-        return fs7.realpathSync(resolved);
-      }
+      return fs7.existsSync(resolved) ? fs7.realpathSync(resolved) : null;
+    } catch {
       return null;
     }
-    const packagePath = path8.join(nodeModulesRoot, resolve);
-    if (!fs7.existsSync(packagePath)) {
-      return null;
+  }
+  const require2 = createRequire(path8.join(configDir, "noop.js"));
+  try {
+    return fs7.realpathSync(
+      path8.dirname(require2.resolve(`${resolve}/package.json`))
+    );
+  } catch {
+  }
+  try {
+    let dir = path8.dirname(require2.resolve(resolve));
+    while (dir !== path8.dirname(dir)) {
+      if (fs7.existsSync(path8.join(dir, "package.json"))) {
+        return fs7.realpathSync(dir);
+      }
+      dir = path8.dirname(dir);
     }
-    return fs7.realpathSync(packagePath);
+  } catch {
+  }
+  try {
+    const packagePath = path8.join(nodeModulesRoot, resolve);
+    return fs7.existsSync(packagePath) ? fs7.realpathSync(packagePath) : null;
   } catch {
     return null;
   }
@@ -932,7 +947,12 @@ function resolvePluginExtensions(plugins, configDir, appType) {
     const resolve = typeof plugin === "string" ? plugin : plugin?.resolve;
     if (!resolve || typeof resolve !== "string") continue;
     const pluginRoot = resolvePluginRoot(resolve, configDir, nodeModulesRoot);
-    if (!pluginRoot) continue;
+    if (!pluginRoot) {
+      console.warn(
+        `[@mercurjs/dashboard-sdk] Could not resolve plugin "${resolve}" from ${configDir}. Its ${appType} extensions will be missing from the build.`
+      );
+      continue;
+    }
     const extFile = path8.join(
       pluginRoot,
       ".medusa/server/src",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/dashboard-sdk",
-  "version": "2.3.2-canary.2",
+  "version": "2.3.2-canary.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",