@medusajs/admin-vite-plugin 2.6.0-snapshot-20250221164338 → 3.0.0-preview-20250211091350

package/dist/index.js

@@ -1354,25 +1354,9 @@ function generateCode4(results) {
   `;
 }
 function formatRoute(route) {
-  let base = `{
+  return `{
     Component: ${route.Component},
-    path: "${route.path}"`;
-  if (route.handle) {
-    base += `,
-    handle: ${route.handle}`;
-  }
-  if (route.loader) {
-    base += `,
-    loader: ${route.loader}`;
-  }
-  if (route.children?.length) {
-    return `${base},
-    children: [
-      ${route.children.map((child) => formatRoute(child)).join(",\n      ")}
-    ]
-  }`;
-  }
-  return `${base}
+    path: "${route.path}",
   }`;
 }
 async function getFilesFromSources7(sources) {
@@ -1387,29 +1371,21 @@ async function getRouteResults(files) {
   const results = (await Promise.all(files.map(parseFile4))).filter(
     (result) => result !== null
   );
-  const routeMap = /* @__PURE__ */ new Map();
-  results.forEach((result) => {
-    const routePath = result.route.path;
-    const isParallel = routePath.includes("/@");
-    if (isParallel) {
-      const parentPath = routePath.split("/@")[0];
-      const parent = routeMap.get(parentPath);
-      if (parent) {
-        parent.route.children = parent.route.children || [];
-        const finalRoute = {
-          ...result.route,
-          path: result.route.path.replace("@", "")
-        };
-        parent.route.children.push(finalRoute);
-        parent.imports.push(...result.imports);
-      }
-    } else {
-      routeMap.set(routePath, result);
-    }
-  });
-  return Array.from(routeMap.values());
+  return results;
 }
 async function parseFile4(file, index) {
+  if (!await isValidRouteFile(file)) {
+    return null;
+  }
+  const routePath = getRoute(file);
+  const imports = generateImports(file, index);
+  const route = generateRoute(routePath, index);
+  return {
+    imports,
+    route
+  };
+}
+async function isValidRouteFile(file) {
   const code = await import_promises7.default.readFile(file, "utf-8");
   let ast = null;
   try {
@@ -1419,21 +1395,8 @@ async function parseFile4(file, index) {
       file,
       error: e
     });
-    return null;
-  }
-  if (!await isValidRouteFile(ast, file)) {
-    return null;
+    return false;
   }
-  const { hasHandle, hasLoader } = await hasNamedExports(ast, file);
-  const routePath = getRoute(file);
-  const imports = generateImports(file, index, hasHandle, hasLoader);
-  const route = generateRoute(routePath, index, hasHandle, hasLoader);
-  return {
-    imports,
-    route
-  };
-}
-async function isValidRouteFile(ast, file) {
   try {
     return await hasDefaultExport(ast);
   } catch (e) {
@@ -1444,68 +1407,22 @@ ${e}`
     return false;
   }
 }
-function generateImports(file, index, hasHandle, hasLoader) {
+function generateImports(file, index) {
   const imports = [];
   const route = generateRouteComponentName(index);
   const importPath = normalizePath(file);
-  if (!hasHandle && !hasLoader) {
-    imports.push(`import ${route} from "${importPath}"`);
-  } else {
-    const namedImports = [
-      hasHandle && `handle as ${generateHandleName(index)}`,
-      hasLoader && `loader as ${generateLoaderName(index)}`
-    ].filter(Boolean).join(", ");
-    imports.push(`import ${route}, { ${namedImports} } from "${importPath}"`);
-  }
+  imports.push(`import ${route} from "${importPath}"`);
   return imports;
 }
-function generateRoute(route, index, hasHandle, hasLoader) {
+function generateRoute(route, index) {
   return {
     Component: generateRouteComponentName(index),
-    path: route,
-    handle: hasHandle ? generateHandleName(index) : void 0,
-    loader: hasLoader ? generateLoaderName(index) : void 0
+    path: route
   };
 }
 function generateRouteComponentName(index) {
   return `RouteComponent${index}`;
 }
-function generateHandleName(index) {
-  return `handle${index}`;
-}
-function generateLoaderName(index) {
-  return `loader${index}`;
-}
-async function hasNamedExports(ast, file) {
-  let hasHandle = false;
-  let hasLoader = false;
-  try {
-    traverse(ast, {
-      ExportNamedDeclaration(path3) {
-        const declaration = path3.node.declaration;
-        if (declaration?.type === "VariableDeclaration") {
-          declaration.declarations.forEach((decl) => {
-            if (decl.id.type === "Identifier" && decl.id.name === "handle") {
-              hasHandle = true;
-            }
-            if (decl.id.type === "Identifier" && decl.id.name === "loader") {
-              hasLoader = true;
-            }
-          });
-        }
-        if (declaration?.type === "FunctionDeclaration" && declaration.id?.name === "loader") {
-          hasLoader = true;
-        }
-      }
-    });
-  } catch (e) {
-    logger.error("An error occurred while checking for named exports.", {
-      file,
-      error: e
-    });
-  }
-  return { hasHandle, hasLoader };
-}
 
 // src/virtual-modules/generate-virtual-display-module.ts
 var import_outdent4 = require("outdent");

package/dist/index.mjs

@@ -1344,25 +1344,9 @@ function generateCode4(results) {
   `;
 }
 function formatRoute(route) {
-  let base = `{
+  return `{
     Component: ${route.Component},
-    path: "${route.path}"`;
-  if (route.handle) {
-    base += `,
-    handle: ${route.handle}`;
-  }
-  if (route.loader) {
-    base += `,
-    loader: ${route.loader}`;
-  }
-  if (route.children?.length) {
-    return `${base},
-    children: [
-      ${route.children.map((child) => formatRoute(child)).join(",\n      ")}
-    ]
-  }`;
-  }
-  return `${base}
+    path: "${route.path}",
   }`;
 }
 async function getFilesFromSources7(sources) {
@@ -1377,29 +1361,21 @@ async function getRouteResults(files) {
   const results = (await Promise.all(files.map(parseFile4))).filter(
     (result) => result !== null
   );
-  const routeMap = /* @__PURE__ */ new Map();
-  results.forEach((result) => {
-    const routePath = result.route.path;
-    const isParallel = routePath.includes("/@");
-    if (isParallel) {
-      const parentPath = routePath.split("/@")[0];
-      const parent = routeMap.get(parentPath);
-      if (parent) {
-        parent.route.children = parent.route.children || [];
-        const finalRoute = {
-          ...result.route,
-          path: result.route.path.replace("@", "")
-        };
-        parent.route.children.push(finalRoute);
-        parent.imports.push(...result.imports);
-      }
-    } else {
-      routeMap.set(routePath, result);
-    }
-  });
-  return Array.from(routeMap.values());
+  return results;
 }
 async function parseFile4(file, index) {
+  if (!await isValidRouteFile(file)) {
+    return null;
+  }
+  const routePath = getRoute(file);
+  const imports = generateImports(file, index);
+  const route = generateRoute(routePath, index);
+  return {
+    imports,
+    route
+  };
+}
+async function isValidRouteFile(file) {
   const code = await fs7.readFile(file, "utf-8");
   let ast = null;
   try {
@@ -1409,21 +1385,8 @@ async function parseFile4(file, index) {
       file,
       error: e
     });
-    return null;
-  }
-  if (!await isValidRouteFile(ast, file)) {
-    return null;
+    return false;
   }
-  const { hasHandle, hasLoader } = await hasNamedExports(ast, file);
-  const routePath = getRoute(file);
-  const imports = generateImports(file, index, hasHandle, hasLoader);
-  const route = generateRoute(routePath, index, hasHandle, hasLoader);
-  return {
-    imports,
-    route
-  };
-}
-async function isValidRouteFile(ast, file) {
   try {
     return await hasDefaultExport(ast);
   } catch (e) {
@@ -1434,68 +1397,22 @@ ${e}`
     return false;
   }
 }
-function generateImports(file, index, hasHandle, hasLoader) {
+function generateImports(file, index) {
   const imports = [];
   const route = generateRouteComponentName(index);
   const importPath = normalizePath(file);
-  if (!hasHandle && !hasLoader) {
-    imports.push(`import ${route} from "${importPath}"`);
-  } else {
-    const namedImports = [
-      hasHandle && `handle as ${generateHandleName(index)}`,
-      hasLoader && `loader as ${generateLoaderName(index)}`
-    ].filter(Boolean).join(", ");
-    imports.push(`import ${route}, { ${namedImports} } from "${importPath}"`);
-  }
+  imports.push(`import ${route} from "${importPath}"`);
   return imports;
 }
-function generateRoute(route, index, hasHandle, hasLoader) {
+function generateRoute(route, index) {
   return {
     Component: generateRouteComponentName(index),
-    path: route,
-    handle: hasHandle ? generateHandleName(index) : void 0,
-    loader: hasLoader ? generateLoaderName(index) : void 0
+    path: route
   };
 }
 function generateRouteComponentName(index) {
   return `RouteComponent${index}`;
 }
-function generateHandleName(index) {
-  return `handle${index}`;
-}
-function generateLoaderName(index) {
-  return `loader${index}`;
-}
-async function hasNamedExports(ast, file) {
-  let hasHandle = false;
-  let hasLoader = false;
-  try {
-    traverse(ast, {
-      ExportNamedDeclaration(path3) {
-        const declaration = path3.node.declaration;
-        if (declaration?.type === "VariableDeclaration") {
-          declaration.declarations.forEach((decl) => {
-            if (decl.id.type === "Identifier" && decl.id.name === "handle") {
-              hasHandle = true;
-            }
-            if (decl.id.type === "Identifier" && decl.id.name === "loader") {
-              hasLoader = true;
-            }
-          });
-        }
-        if (declaration?.type === "FunctionDeclaration" && declaration.id?.name === "loader") {
-          hasLoader = true;
-        }
-      }
-    });
-  } catch (e) {
-    logger.error("An error occurred while checking for named exports.", {
-      file,
-      error: e
-    });
-  }
-  return { hasHandle, hasLoader };
-}
 
 // src/virtual-modules/generate-virtual-display-module.ts
 import { outdent as outdent4 } from "outdent";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/admin-vite-plugin",
-  "version": "2.6.0-snapshot-20250221164338",
+  "version": "3.0.0-preview-20250211091350",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -30,8 +30,8 @@
     "@types/node": "^20.10.4",
     "tsup": "8.0.1",
     "typescript": "5.3.3",
-    "vite": "^5.4.14",
-    "vitest": "^3.0.5"
+    "vite": "^5.2.11",
+    "vitest": "^2.1.9"
   },
   "peerDependencies": {
     "vite": "^5.0.0"
@@ -40,7 +40,7 @@
     "@babel/parser": "7.25.6",
     "@babel/traverse": "7.25.6",
     "@babel/types": "7.25.6",
-    "@medusajs/admin-shared": "2.6.0-snapshot-20250221164338",
+    "@medusajs/admin-shared": "3.0.0-preview-20250211091350",
     "chokidar": "3.5.3",
     "fdir": "6.1.1",
     "magic-string": "0.30.5",