dumi 2.3.1 → 2.3.3-beta.0

package/dist/assetParsers/block.js

@@ -83,7 +83,8 @@ async function parseBlockAsset(opts) {
                   type: "NPM",
                   value: pkg.version
                 };
-                result.resolveMap[args.path] = args.path;
+                if (opts.techStack.runtimeOpts)
+                  result.resolveMap[args.path] = args.path;
               }
               return { path: args.path, external: true };
             }
@@ -143,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/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/dist/features/meta.js

@@ -98,7 +98,8 @@ var meta_default = (api) => {
       path: "dumi/meta/runtime.ts",
       tplPath: require.resolve("../templates/meta/runtime.ts.tpl"),
       context: {
-        deepmerge: (0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("deepmerge/package")))
+        deepmerge: (0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("deepmerge/package"))),
+        rc_util: (0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("rc-util/package")))
       }
     });
     api.writeTmpFile({

package/dist/features/theme/index.js

@@ -33,6 +33,7 @@ __export(theme_exports, {
 });
 module.exports = __toCommonJS(theme_exports);
 var import_constants = require("../../constants");
+var import_utils = require("../../utils");
 var import_bundler_utils = require("@umijs/bundler-utils");
 var import_child_process = require("child_process");
 var import_fs = __toESM(require("fs"));
@@ -87,7 +88,7 @@ function checkMinor2ByPkg(pkg) {
   if ((_a = pkg.name) == null ? void 0 : _a.startsWith("@examples/"))
     return true;
   const ver = ((_b = pkg.peerDependencies) == null ? void 0 : _b.dumi) || ((_c = pkg.devDependencies) == null ? void 0 : _c.dumi) || "^2.0.0";
-  return import_plugin_utils.semver.subset(ver, import_constants.VERSION_2_LEVEL_NAV, { includePrerelease: true });
+  return (0, import_utils.isVersionInRange)(ver, import_constants.VERSION_2_LEVEL_NAV);
 }
 var theme_default = (api) => {
   const defaultThemeData = (0, import_loader.default)(DEFAULT_THEME_PATH);
@@ -318,6 +319,7 @@ export default DumiLoading;
             api.config.themeConfig
           )
         ),
+        rc_util: (0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("rc-util/package"))),
         _2_level_nav_available: api.appData._2LevelNavAvailable
       }
     });

package/dist/loaders/markdown/transformer/index.js

@@ -33,8 +33,8 @@ __export(transformer_exports, {
 });
 module.exports = __toCommonJS(transformer_exports);
 var import_constants = require("../../../constants");
+var import_utils = require("../../../utils");
 var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
-var import_plugin_utils = require("umi/plugin-utils");
 var import_rehypeDemo = __toESM(require("./rehypeDemo"));
 var import_rehypeDesc = __toESM(require("./rehypeDesc"));
 var import_rehypeEnhancedTag = __toESM(require("./rehypeEnhancedTag"));
@@ -56,9 +56,7 @@ function keepSoftBreak(pkg) {
   if (((_a = pkg == null ? void 0 : pkg.name) == null ? void 0 : _a.startsWith("@examples/")) || (pkg == null ? void 0 : pkg.name) === "dumi")
     return false;
   const ver = ((_b = pkg == null ? void 0 : pkg.devDependencies) == null ? void 0 : _b.dumi) ?? ((_c = pkg == null ? void 0 : pkg.dependencies) == null ? void 0 : _c.dumi) ?? "^2.0.0";
-  return !import_plugin_utils.semver.subset(ver, import_constants.VERSION_2_DEPRECATE_SOFT_BREAKS, {
-    includePrerelease: true
-  });
+  return !(0, import_utils.isVersionInRange)(ver, import_constants.VERSION_2_DEPRECATE_SOFT_BREAKS);
 }
 async function applyUnifiedPlugin(opts) {
   const [plugin, options] = Array.isArray(opts.plugin) ? opts.plugin : [opts.plugin];

package/dist/templates/ContextWrapper.ts.tpl

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { useOutlet, history } from 'dumi';
-import { warning } from 'rc-util';
+import { warning } from '{{{rc_util}}}';
 import { SiteContext, type ISiteContext } from '{{{contextPath}}}';
 import { components } from '../meta/atoms';
 import { locales } from '../locales/config';

package/dist/templates/meta/runtime.ts.tpl

@@ -1,4 +1,4 @@
-import { warning } from 'rc-util';
+import { warning } from '{{{rc_util}}}';
 import deepmerge from '{{{deepmerge}}}';
 import { getRouteMetaById } from './exports';
 

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
+import type { Range, RangeOptions } from '@umijs/utils/compiled/semver';
 import Cache from 'file-system-cache';
 /**
  * get route path from file-system path
@@ -47,4 +48,8 @@ export declare function generateMetaChunkName(path: string, cwd: string, locales
  * generate hash for string
  */
 export declare function getContentHash(content: string, length?: number): string;
+/**
+ * check if version is in range
+ */
+export declare function isVersionInRange(version: string, range: string | Range, options?: RangeOptions): boolean;
 export {};

package/dist/utils.js

@@ -38,6 +38,7 @@ __export(utils_exports, {
   getFileIdFromFsPath: () => getFileIdFromFsPath,
   getFileRangeLines: () => getFileRangeLines,
   getProjectRoot: () => getProjectRoot,
+  isVersionInRange: () => isVersionInRange,
   parseCodeFrontmatter: () => parseCodeFrontmatter,
   tryFatherBuildConfigs: () => tryFatherBuildConfigs
 });
@@ -159,6 +160,15 @@ function generateMetaChunkName(path2, cwd, locales = []) {
 function getContentHash(content2, length = 8) {
   return (0, import_crypto.createHash)("md5").update(content2).digest("hex").slice(0, length);
 }
+function isVersionInRange(version, range, options = { includePrerelease: true }) {
+  if (import_plugin_utils.semver.valid(version)) {
+    return import_plugin_utils.semver.satisfies(version, range, options);
+  }
+  if (import_plugin_utils.semver.validRange(version)) {
+    return import_plugin_utils.semver.subset(version, range, options);
+  }
+  return false;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   _setFSCacheDir,
@@ -170,6 +180,7 @@ function getContentHash(content2, length = 8) {
   getFileIdFromFsPath,
   getFileRangeLines,
   getProjectRoot,
+  isVersionInRange,
   parseCodeFrontmatter,
   tryFatherBuildConfigs
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.3.1",
+  "version": "2.3.3-beta.0",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",

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

@@ -23,6 +23,10 @@ var Toc = function Toc() {
     _useState2 = _slicedToArray(_useState, 2),
     sectionRefs = _useState2[0],
     setSectionRefs = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    headerHeight = _useState4[0],
+    setHeaderHeight = _useState4[1];
   var memoToc = React.useMemo(function () {
     var toc = meta.toc;
     if (tabMeta) {
@@ -47,8 +51,17 @@ var Toc = function Toc() {
       setSectionRefs(refs);
     }
   }, [pathname, search, loading, memoToc]);
+  useEffect(function () {
+    if (sectionRefs.length > 0) {
+      // find the header height, and set it to scrollspy offset
+      // because the header is sticky, so we need to set the offset to avoid the active item is hidden by the header
+      var header = document.querySelector('.dumi-default-header');
+      setHeaderHeight(header ? header.clientHeight : 0);
+    }
+  }, [sectionRefs]);
   return sectionRefs.length ? /*#__PURE__*/React.createElement(ScrollSpy, {
-    sectionRefs: sectionRefs
+    sectionRefs: sectionRefs,
+    offset: -headerHeight
   }, function (_ref3) {
     var currentElementIndexInViewport = _ref3.currentElementIndexInViewport;
     // for keep prev item active when no item in viewport