dumi 2.0.0-rc.7 → 2.0.0-rc.8

package/dist/features/routes.js

@@ -44,10 +44,10 @@ function localizeUmiRoute(route, locales) {
     route.absPath = route.path !== "/" ? `/${route.path}` : route.path;
   }
 }
-function flatRoute(route) {
-  if (route.parentId !== "DocLayout") {
-    route.parentId = "DocLayout";
-    route.path = route.path === "*" ? route.path.toLowerCase() : route.absPath.slice(1).toLowerCase();
+function flatRoute(route, docLayoutId) {
+  if (route.parentId !== docLayoutId) {
+    route.parentId = docLayoutId;
+    route.path = route.path === "*" ? route.path : route.absPath.slice(1);
   }
 }
 function getClientPageFile(file, cwd) {
@@ -121,8 +121,6 @@ var routes_default = (api) => {
     }
     Object.entries(pages).forEach(([, route]) => {
       route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(api.config.conventionRoutes.base, route.file));
-      flatRoute(route);
-      localizeUmiRoute(route, api.config.locales);
       routes[route.id] = route;
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
@@ -133,14 +131,12 @@ var routes_default = (api) => {
       });
       Object.entries(dirRoutes).forEach(([key, route]) => {
         route.id = `${dir}/${key}`;
-        flatRoute(route);
         if (type) {
           const pluralType = (0, import_pluralize.plural)(type);
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");
           route.absPath = `/${route.path}`;
         }
         route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base, route.file));
-        localizeUmiRoute(route, api.config.locales);
         routes[route.id] = route;
       });
     });
@@ -148,7 +144,7 @@ var routes_default = (api) => {
       const base = import_path.default.join(api.cwd, dir);
       const atomFiles = import_plugin_utils.glob.sync("{*,*/index,*/index.*,*/README,*/README.*}.md", { cwd: base });
       atomFiles.forEach((file) => {
-        const routePath = (0, import_plugin_utils.winPath)(import_path.default.join((0, import_pluralize.plural)(type), file)).replace(/(\/index|\/README)?\.md$/, "").replace(/\./g, "/").toLowerCase();
+        const routePath = (0, import_plugin_utils.winPath)(import_path.default.join((0, import_pluralize.plural)(type), file)).replace(/(\/index|\/README)?\.md$/, "").replace(/\./g, "/");
         const routeId = (0, import_utils.createRouteId)(file);
         routes[routeId] = {
           id: routeId,
@@ -157,9 +153,19 @@ var routes_default = (api) => {
           parentId: docLayoutId,
           file: (0, import_plugin_utils.winPath)(import_path.default.resolve(base, file))
         };
-        localizeUmiRoute(routes[routeId], api.config.locales);
       });
     });
+    Object.values(routes).forEach((route) => {
+      if (route.path !== encodeURI(route.path)) {
+        throw new Error(`Invalid route path: ${route.path}, please rename it with only alphanumeric, dash and slash.
+    at ${route.file}`);
+      } else if (!route.isLayout) {
+        flatRoute(route, docLayoutId);
+        localizeUmiRoute(route, api.config.locales);
+        route.path = route.path.toLowerCase();
+        route.absPath = route.absPath.toLowerCase();
+      }
+    });
     if (Object.values(pages).every((route) => route.path !== "*")) {
       routes["404"] = {
         id: "404",
@@ -176,12 +182,6 @@ var routes_default = (api) => {
       parentId: demoLayoutId,
       file: getClientPageFile("client/pages/Demo", api.cwd)
     };
-    Object.values(routes).forEach((route) => {
-      if (route.path !== encodeURI(route.path)) {
-        throw new Error(`Invalid route path: ${route.path}, please rename it with only alphanumeric, dash and slash.
-    at ${route.file}`);
-      }
-    });
     return routes;
   });
   api.addLayouts(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.0-rc.8",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",