dumi 2.3.3 → 2.3.5

package/dist/assetParsers/block.js

@@ -144,7 +144,7 @@ async function parseBlockAsset(opts) {
                     }
                   );
                   ["description", "title"].forEach((key) => {
-                    frontmatter[key] || (frontmatter[key] = frontmatter[`${key}.${opts.fileLocale}`]);
+                    frontmatter[key] = frontmatter[`${key}.${opts.fileLocale}`] || frontmatter[key];
                   });
                   result.frontmatter = frontmatter;
                 }

package/dist/client/theme-api/useRouteMeta.js

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import deepmerge from 'deepmerge';
 import { getRouteMetaById, matchRoutes, useAppData, useLocation, useRouteData } from 'dumi';
 import { useCallback, useState } from 'react';
 import { useIsomorphicLayoutEffect } from "./utils";
@@ -26,6 +27,7 @@ function getCachedRouteMeta(route) {
           var _ref, _ref$key;
           (_ref$key = (_ref = meta)[key]) !== null && _ref$key !== void 0 ? _ref$key : _ref[key] = route.meta[key];
         });
+        meta.frontmatter = deepmerge(meta.frontmatter, route.meta.frontmatter);
       }
       return meta;
     };

package/dist/features/compile/babelLoaderCustomize.js

@@ -26,7 +26,9 @@ function babelLoaderCustomize() {
   return {
     config(config) {
       const context = this;
-      if (config.options.filename && context.resourceQuery.includes("type=meta")) {
+      if (config.options.filename && ["type=demo", "type=frontmatter", "type=demo-index", "type=text"].some(
+        (v) => context.resourceQuery.includes(v)
+      )) {
         config.options.filename += context.resourceQuery;
       }
       return config.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -163,7 +163,7 @@
     "typescript": "~5.0.4",
     "vitest": "^0.33.0",
     "zx": "^7.2.3",
-    "dumi-theme-mobile": "2.3.0"
+    "dumi-theme-mobile": "2.3.5"
   },
   "peerDependencies": {
     "react": ">=16.8",