@mercurjs/dashboard-sdk 2.0.0-canary.71 → 2.0.0-canary.73

package/dist/index.cjs

@@ -257,7 +257,7 @@ function buildRouteTree(results) {
   }
   return Array.from(routeMap.values());
 }
-function generateRoutes({ srcDir, pluginDirs }) {
+function generateRoutes({ srcDir, pluginExtensions }) {
   const pagesDir = import_path.default.join(srcDir, "pages");
   let index = 0;
   const results = [];
@@ -268,25 +268,27 @@ function generateRoutes({ srcDir, pluginDirs }) {
       index++;
     }
   }
-  for (const pluginDir of pluginDirs) {
-    for (const file of crawlPages(pluginDir)) {
-      const result = parseFile(file, pluginDir, index);
-      if (result) {
-        results.push(result);
-        index++;
-      }
-    }
-  }
-  if (results.length === 0) {
+  const pluginImports = pluginExtensions.map(
+    (ext, i) => `import * as __pluginRaw${i} from "${normalizePath(ext)}"`
+  );
+  const pluginUnwraps = pluginExtensions.map(
+    (_, i) => `const __plugin${i} = __pluginRaw${i}.default ?? __pluginRaw${i}`
+  );
+  const pluginSpreads = pluginExtensions.map(
+    (_, i) => `    ...(__plugin${i}.routeModule?.routes ?? [])`
+  );
+  const routeTree = buildRouteTree(results);
+  const appImports = routeTree.flatMap((r) => r.imports);
+  const appRoutes = routeTree.map((r) => formatRoute(r.route));
+  const allImports = [...appImports, ...pluginImports, ...pluginUnwraps];
+  const allRoutes = [...appRoutes, ...pluginSpreads];
+  if (allImports.length === 0 && allRoutes.length === 0) {
     return `export const customRoutes = []`;
   }
-  const routeTree = buildRouteTree(results);
-  const imports = routeTree.flatMap((result) => result.imports);
-  const routes = routeTree.map((result) => formatRoute(result.route));
-  return `${imports.join("\n")}
+  return `${allImports.join("\n")}
 
 export const customRoutes = [
-${routes.join(",\n")}
+${allRoutes.join(",\n")}
 ]`;
 }
 
@@ -394,7 +396,7 @@ function parseFile2(file, pagesDir, index) {
     menuItem: generateMenuItem(config, file, pagesDir, index)
   };
 }
-function generateMenuItems({ srcDir, pluginDirs }) {
+function generateMenuItems({ srcDir, pluginExtensions }) {
   const pagesDir = import_path2.default.join(srcDir, "pages");
   let index = 0;
   const results = [];
@@ -405,25 +407,27 @@ function generateMenuItems({ srcDir, pluginDirs }) {
       index++;
     }
   }
-  for (const pluginDir of pluginDirs) {
-    for (const file of crawlPages2(pluginDir)) {
-      const result = parseFile2(file, pluginDir, index);
-      if (result) {
-        results.push(result);
-        index++;
-      }
-    }
-  }
-  if (results.length === 0) {
+  const pluginImports = pluginExtensions.map(
+    (ext, i) => `import * as __pluginRaw${i} from "${normalizePath(ext)}"`
+  );
+  const pluginUnwraps = pluginExtensions.map(
+    (_, i) => `const __plugin${i} = __pluginRaw${i}.default ?? __pluginRaw${i}`
+  );
+  const pluginSpreads = pluginExtensions.map(
+    (_, i) => `        ...(__plugin${i}.menuItemModule?.menuItems ?? [])`
+  );
+  const appImports = results.map((r) => r.import);
+  const appMenuItems = results.map((r) => formatMenuItem(r.menuItem));
+  const allImports = [...appImports, ...pluginImports, ...pluginUnwraps];
+  const allMenuItems = [...appMenuItems, ...pluginSpreads];
+  if (allImports.length === 0 && allMenuItems.length === 0) {
     return `export default { menuItems: [] }`;
   }
-  const imports = results.map((r) => r.import);
-  const menuItems = results.map((r) => formatMenuItem(r.menuItem));
-  return `${imports.join("\n")}
+  return `${allImports.join("\n")}
 
 export default {
     menuItems: [
-${menuItems.join(",\n")}
+${allMenuItems.join(",\n")}
     ]
 }`;
 }
@@ -552,9 +556,9 @@ function resolvePluginRoot(resolve, configDir, nodeModulesRoot) {
     return null;
   }
 }
-function resolvePluginDirs(plugins, configDir) {
+function resolvePluginExtensions(plugins, configDir) {
   const nodeModulesRoot = findNodeModulesRoot(configDir);
-  const dirs = [];
+  const extensions = [];
   const appTypes = ["admin", "vendor"];
   for (const plugin of plugins) {
     const resolve = typeof plugin === "string" ? plugin : plugin?.resolve;
@@ -562,13 +566,13 @@ function resolvePluginDirs(plugins, configDir) {
     const pluginRoot = resolvePluginRoot(resolve, configDir, nodeModulesRoot);
     if (!pluginRoot) continue;
     for (const appType of appTypes) {
-      const extDir = import_path5.default.join(pluginRoot, ".medusa/server/src", appType);
-      if (import_fs4.default.existsSync(extDir) && import_fs4.default.statSync(extDir).isDirectory()) {
-        dirs.push(extDir);
+      const extFile = import_path5.default.join(pluginRoot, ".medusa/server/src", appType, "index.js");
+      if (import_fs4.default.existsSync(extFile)) {
+        extensions.push(extFile);
       }
     }
   }
-  return dirs;
+  return extensions;
 }
 async function loadMedusaConfig(medusaConfigPath, root) {
   try {
@@ -587,10 +591,10 @@ async function loadMedusaConfig(medusaConfigPath, root) {
       }
     }
     const plugins = medusaConfig?.plugins ?? [];
-    const pluginDirs = resolvePluginDirs(plugins, configDir);
-    return { base, pluginDirs };
+    const pluginExtensions = resolvePluginExtensions(plugins, configDir);
+    return { base, pluginExtensions };
   } catch {
-    return { pluginDirs: [] };
+    return { pluginExtensions: [] };
   }
 }
 function mercurDashboardPlugin(pluginConfig) {
@@ -601,7 +605,7 @@ function mercurDashboardPlugin(pluginConfig) {
     async config(viteConfig) {
       root = viteConfig.root || process.cwd();
       const medusaConfigPath = import_path5.default.resolve(root, pluginConfig.medusaConfigPath);
-      const { base, pluginDirs } = await loadMedusaConfig(medusaConfigPath, root);
+      const { base, pluginExtensions } = await loadMedusaConfig(medusaConfigPath, root);
       const srcDir = import_path5.default.join(root, "src");
       const backendUrl = pluginConfig.backendUrl ?? "http://localhost:9000";
       config = {
@@ -610,7 +614,7 @@ function mercurDashboardPlugin(pluginConfig) {
         base,
         root,
         srcDir,
-        pluginDirs
+        pluginExtensions
       };
       return {
         base: config.base,
@@ -619,6 +623,7 @@ function mercurDashboardPlugin(pluginConfig) {
           "__BASE__": JSON.stringify(config.base || "/")
         },
         optimizeDeps: {
+          include: pluginExtensions,
           exclude: ["virtual:mercur/config", "virtual:mercur/routes", "virtual:mercur/components", "virtual:mercur/menu-items", "virtual:mercur/i18n"]
         }
       };

package/dist/index.d.cts

@@ -21,7 +21,7 @@ interface BuiltMercurConfig extends MercurConfig {
     base?: string;
     root: string;
     srcDir: string;
-    pluginDirs: string[];
+    pluginExtensions: string[];
 }
 type RouteConfig = {
     label: string;

package/package.json

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