dumi 2.4.6-beta.1 → 2.4.7

package/dist/client/theme-api/index.d.ts

@@ -12,7 +12,7 @@ export { useLiveDemo } from './useLiveDemo';
 export { useLocale } from './useLocale';
 export { useNavData } from './useNavData';
 export { usePrefersColor } from './usePrefersColor';
-export { useRouteMeta } from './useRouteMeta';
+export { useMatchedRoute, useRouteMeta } from './useRouteMeta';
 export { useFullSidebarData, useSidebarData } from './useSidebarData';
 export { useSiteSearch } from './useSiteSearch';
 export { useTabMeta } from './useTabMeta';

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

@@ -11,7 +11,7 @@ export { useLiveDemo } from "./useLiveDemo";
 export { useLocale } from "./useLocale";
 export { useNavData } from "./useNavData";
 export { usePrefersColor } from "./usePrefersColor";
-export { useRouteMeta } from "./useRouteMeta";
+export { useMatchedRoute, useRouteMeta } from "./useRouteMeta";
 export { useFullSidebarData, useSidebarData } from "./useSidebarData";
 export { useSiteSearch } from "./useSiteSearch";
 export { useTabMeta } from "./useTabMeta";

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

@@ -110,7 +110,7 @@ export var useLiveDemo = function useLiveDemo(id, opts) {
             _context.prev = 12;
             _context.next = 15;
             return renderOpts.compile(entryFileCode, {
-              filename: "".concat(id, "-").concat(entryFileName)
+              filename: entryFileName
             });
           case 15:
             entryFileCode = _context.sent;

package/dist/client/theme-api/useRouteMeta.d.ts

@@ -1,4 +1,16 @@
 import type { IRouteMeta } from './types';
+/**
+ * hook for get matched route
+ * @internal internal use. Do not use in your production code.
+ */
+export declare const useMatchedRoute: () => {
+    [key: string]: any;
+    path?: string | undefined;
+    parentId?: string | undefined;
+    meta?: IRouteMeta | undefined;
+    id: string;
+    redirect?: string | undefined;
+};
 /**
  * hook for get matched route meta
  */

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

@@ -73,9 +73,10 @@ function getCachedRouteMeta(route) {
 }
 
 /**
- * hook for get matched route meta
+ * hook for get matched route
+ * @internal internal use. Do not use in your production code.
  */
-export var useRouteMeta = function useRouteMeta() {
+export var useMatchedRoute = function useMatchedRoute() {
   var _useRouteData = useRouteData(),
     route = _useRouteData.route;
   var _useLocation = useLocation(),
@@ -99,9 +100,16 @@ export var useRouteMeta = function useRouteMeta() {
     _useState2 = _slicedToArray(_useState, 2),
     matchedRoute = _useState2[0],
     setMatchedRoute = _useState2[1];
-  var meta = getCachedRouteMeta(matchedRoute);
   useIsomorphicLayoutEffect(function () {
     setMatchedRoute(getter);
   }, [clientRoutes.length, pathname]);
-  return meta;
+  return matchedRoute;
+};
+
+/**
+ * hook for get matched route meta
+ */
+export var useRouteMeta = function useRouteMeta() {
+  var route = useMatchedRoute();
+  return getCachedRouteMeta(route);
 };

package/dist/features/compile/index.js

@@ -104,6 +104,9 @@ var compile_default = (api) => {
     if (!babelInUmi)
       return memo;
     const loaderPath = require.resolve("../../loaders/markdown");
+    memo.resolve.byDependency.set("commonjs", {
+      conditionNames: ["require", "node", "import"]
+    });
     const loaderBaseOpts = {
       techStacks,
       cwd: api.cwd,

package/dist/loaders/markdown/index.js

@@ -34,7 +34,6 @@ __export(markdown_exports, {
 module.exports = __toCommonJS(markdown_exports);
 var import_tabs = require("../../features/tabs");
 var import_utils = require("../../utils");
-var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
@@ -50,11 +49,6 @@ function getDemoSourceFiles(demos = []) {
     return ret;
   }, []);
 }
-var resolver = import_enhanced_resolve.default.create.sync({
-  mainFields: ["browser", "module", "main"],
-  extensions: [".js", ".jsx", ".ts", ".tsx", ".json"],
-  conditionNames: ["import", "default", "browser"]
-});
 function emitDefault(opts, ret) {
   const { frontmatter, demos } = ret.meta;
   const isTabContent = (0, import_tabs.isTabRouteFile)(this.resourcePath);
@@ -135,11 +129,11 @@ export const demos = {
           return "undefined";
         const entryFileName = Object.keys(this.asset.dependencies)[0];
         const context = Object.entries(this.resolveMap).reduce(
-          (acc, [key, resolvedPath]) => ({
+          (acc, [key, path2]) => ({
             ...acc,
             // omit entry file
             ...key !== entryFileName ? {
-              [key]: `{{{require('${resolvedPath === opts.pkg.name || import_path.default.isAbsolute(resolvedPath) ? resolvedPath : resolver(opts.cwd, resolvedPath)}')}}}`
+              [key]: `{{{require('${path2}')}}}`
             } : {}
           }),
           {}

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

@@ -75,6 +75,7 @@ export function useDemo(id: string): IDemoData | undefined {
       demoIdMap[id]?.().then(({ demos }) => {
         // expand context for omit ext
         expandDemoContext(demos[id].context);
+
         return demos[id];
       }),
     );
@@ -139,7 +140,6 @@ export function getRouteMetaById<T extends { syncOnly?: boolean }>(
 ): T extends { syncOnly: true }
   ? IRouteMeta | undefined
   : Promise<IRouteMeta> | undefined {
-
   if (filesMeta[id]) {
     const { frontmatter, toc, textGetter, tabs } = filesMeta[id];
     const routeMeta: IRouteMeta = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.6-beta.1",
+  "version": "2.4.7",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -78,7 +78,7 @@
     "enhanced-resolve": "^5.15.0",
     "estree-util-to-js": "^1.2.0",
     "estree-util-visit": "^1.2.1",
-    "file-system-cache": "^2.4.3",
+    "file-system-cache": "2.4.4",
     "github-slugger": "^1.5.0",
     "hast-util-is-element": "^2.1.3",
     "hast-util-raw": "^8.0.0",

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

@@ -27,14 +27,19 @@ var SourceCodeEditor = function SourceCodeEditor(props) {
     var _elm$current;
     var pre = (_elm$current = elm.current) === null || _elm$current === void 0 ? void 0 : _elm$current.querySelector('pre');
     if (pre) {
+      var lineCell = pre.querySelector('.line-cell');
       var preStyle = window.getComputedStyle(pre);
-      setStyle({
+      var styles = {
         fontSize: preStyle.fontSize,
         fontFamily: preStyle.fontFamily,
         lineHeight: preStyle.lineHeight,
         padding: preStyle.padding,
         margin: preStyle.margin
-      });
+      };
+      if (lineCell) {
+        styles.paddingLeft = lineCell.offsetLeft;
+      }
+      setStyle(styles);
     } else {
       console.warn('[dumi] pre element not found in SourceCode component, the SourceCodeEditor will be disabled, you can report an issue to dumi repository.');
     }

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

@@ -5,7 +5,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 { Scrollspy as ScrollSpy } from '@makotot/ghostui';
+import { Scrollspy as ScrollSpy } from '@makotot/ghostui/src/Scrollspy';
 import { history, Link, useLocation, useRouteMeta, useSiteData, useTabMeta } from 'dumi';
 import React, { useEffect, useRef, useState } from 'react';
 import "./index.less";