dumi 2.1.0 → 2.1.1

package/dist/features/routes.js

@@ -35,16 +35,19 @@ var CTX_LAYOUT_ID = "dumi-context-layout";
 function normalizeDocDir(docDir) {
   return typeof docDir === "object" ? docDir : { dir: docDir };
 }
+function kebabCaseRoutePath(routePath) {
+  return routePath.split("/").map((p) => import_plugin_utils.lodash.kebabCase(p)).join("/");
+}
 function localizeUmiRoute(route, locales) {
   const locale = locales.find((locale2) => route.path.endsWith(`/${locale2.id}`) && import_path.default.parse(route.file).name.endsWith(`.${locale2.id}`));
   if (locale) {
     const base = !("base" in locale) || locale.base === "/" ? "" : locale.base.replace(/^(\/)(.+)$/, "$2$1");
     const suffix = "suffix" in locale ? locale.suffix : "";
-    route.path = `${base}${route.path.replace(new RegExp(`/${locale.id}$`), "").replace(/((^|\/)(index|README))$/, "").toLowerCase()}${suffix}`;
+    route.path = `${base}${kebabCaseRoutePath(route.path.replace(new RegExp(`/${locale.id}$`), "").replace(/((^|\/)(index|README))$/, ""))}${suffix}`;
     route.absPath = route.path !== "/" ? `/${route.path}` : route.path;
   } else {
-    route.path = route.path.toLowerCase();
-    route.absPath = route.absPath.toLowerCase();
+    route.path = kebabCaseRoutePath(route.path);
+    route.absPath = kebabCaseRoutePath(route.absPath);
   }
 }
 function flatRoute(route, docLayoutId) {
@@ -53,10 +56,6 @@ function flatRoute(route, docLayoutId) {
     route.path = route.path === "*" ? route.path : route.absPath.slice(1);
   }
 }
-function kebabCaseRoute(route) {
-  route.path = route.path.split("/").map((p) => import_plugin_utils.lodash.kebabCase(p)).join("/");
-  route.absPath = route.absPath.split("/").map((p) => import_plugin_utils.lodash.kebabCase(p)).join("/");
-}
 function getClientPageFile(file, cwd) {
   try {
     return import_plugin_utils.resolve.sync(`dumi/dist/${file}`, {
@@ -168,7 +167,6 @@ var routes_default = (api) => {
         throw new Error(`Invalid route path: ${route.path}, please rename it with only alphanumeric, dash and slash.
     at ${route.file}`);
       } else if (!route.isLayout) {
-        kebabCaseRoute(route);
         flatRoute(route, docLayoutId);
         localizeUmiRoute(route, api.config.locales);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",

package/theme-default/slots/ColorSwitch/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { FormattedMessage, useIntl, usePrefersColor } from 'dumi';
+import { FormattedMessage, useIntl, usePrefersColor, useSiteData } from 'dumi';
 import React from 'react';
 import "./index.less";
 
@@ -45,11 +45,15 @@ var ICON_MAPPING = {
 };
 
 var ColorSwitch = function ColorSwitch() {
+  var _useSiteData = useSiteData(),
+      defaultColor = _useSiteData.themeConfig.prefersColor.default;
+
   var intl = useIntl();
 
   var _usePrefersColor = usePrefersColor(),
       _usePrefersColor2 = _slicedToArray(_usePrefersColor, 3),
-      prefersColor = _usePrefersColor2[1],
+      _usePrefersColor2$ = _usePrefersColor2[1],
+      prefersColor = _usePrefersColor2$ === void 0 ? defaultColor : _usePrefersColor2$,
       setPrefersColor = _usePrefersColor2[2];
 
   var Icon = ICON_MAPPING[prefersColor];

package/theme-default/slots/LangSwitch/index.js

@@ -20,7 +20,9 @@ function getTargetLocalePath(_ref) {
       current = _ref.current,
       target = _ref.target;
   var clearPath = 'base' in current ? pathname.replace(current.base.replace(/\/$/, ''), '') : pathname.replace(new RegExp("".concat(current.suffix, "$")), '');
-  return 'base' in target ? "".concat(target.base).concat(clearPath).replace(/^\/\//, '/') : "".concat(clearPath).concat(target.suffix);
+  return 'base' in target ? "".concat( // for `/` base, strip duplicated leading slash
+  target.base.replace(/\/$/, '')).concat(clearPath) // for `/` clearPath, strip duplicated ending slash
+  .replace(/([^/])\/$/, '$1') : "".concat(clearPath).concat(target.suffix);
 }
 
 var SingleSwitch = function SingleSwitch(_ref2) {