dumi 2.0.4 → 2.0.5

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

@@ -0,0 +1,8 @@
+import { AtomAsset, ExamplePresetAsset } from 'dumi-assets-types';
+import { type FC } from 'react';
+interface IAtomRendererProps {
+    type: AtomAsset['type'];
+    value: ExamplePresetAsset['value'];
+}
+export declare const AtomRenderer: FC<IAtomRendererProps>;
+export {};

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

@@ -0,0 +1,99 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+import { useSiteData } from 'dumi';
+import React from 'react';
+
+function builtInProcessor(entity, entryExports) {
+  var mod;
+
+  switch (entity.$$__type) {
+    case 'function':
+      // eslint-disable-next-line no-eval
+      return eval(entity.$$__body.sourceCode);
+
+    case 'element':
+      // find child component from entry exports
+      mod = entity.$$__body.componentName.split('.').reduce(function (col, cur) {
+        return col[cur];
+      }, entryExports); // fallback to HTML tag
+
+      if (mod === undefined) return entity.$$__body.componentName; // support pure render for antd components
+
+      return '_InternalPanelDoNotUseOrYouWillBeFired' in mod ? mod._InternalPanelDoNotUseOrYouWillBeFired : mod;
+  }
+}
+
+function deepReplace(value, entityProcessor) {
+  // transform array props
+  if (Array.isArray(value)) {
+    return value.map(function (e) {
+      return deepReplace(e, entityProcessor);
+    });
+  } // transform element props
+
+
+  if (_typeof(value) === 'object' && (value === null || value === void 0 ? void 0 : value.$$__type) === 'element') {
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    return translatePresetToReact(value.$$__body, entityProcessor);
+  } // transform pure object props
+
+
+  if (_typeof(value) === 'object' && Object.prototype.toString.call(value) === '[object Object]') {
+    return Object.entries(value).reduce(function (col, _ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+
+      return _objectSpread(_objectSpread({}, col), {}, _defineProperty({}, key, deepReplace(value, entityProcessor)));
+    }, {});
+  }
+
+  return value;
+}
+
+function translatePresetToReact(value, processor) {
+  var props = value.props,
+      size = value.size;
+  var Component = processor({
+    $$__type: 'element',
+    $$__body: value
+  });
+  return /*#__PURE__*/React.createElement(Component, deepReplace(_objectSpread(_objectSpread({}, props), {}, {
+    style: _objectSpread(_objectSpread({}, props.style), size)
+  }), processor));
+}
+
+export var AtomRenderer = function AtomRenderer(props) {
+  var _useSiteData = useSiteData(),
+      entryExports = _useSiteData.entryExports;
+
+  switch (props.type) {
+    case 'COMPONENT':
+      return translatePresetToReact(props.value, function (entity) {
+        // TODO: support custom processor
+        return builtInProcessor(entity, entryExports);
+      });
+
+    default:
+      // TODO: handle FUNCTION type
+      return /*#__PURE__*/React.createElement(React.Fragment, null, props.type, " atom is not supported.");
+  }
+};

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

@@ -4,6 +4,7 @@ import { type ComponentType } from 'react';
 import type { ILocalesConfig, IPreviewerProps, IThemeConfig } from './types';
 interface ISiteContext {
     pkg: Partial<Record<keyof typeof PICKED_PKG_FIELDS, any>>;
+    entryExports: Record<string, any>;
     demos: Record<string, {
         component: ComponentType;
         asset: IPreviewerProps['asset'];

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

@@ -1,6 +1,7 @@
 import { createContext, useContext } from 'react';
 export var SiteContext = /*#__PURE__*/createContext({
   pkg: {},
+  entryExports: {},
   demos: {},
   components: {},
   locales: [],

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

@@ -1,4 +1,5 @@
 export { createIntlCache, defineMessages, FormattedDate, FormattedDateParts, FormattedDisplayName, FormattedList, FormattedMessage, FormattedNumber, FormattedNumberParts, FormattedPlural, FormattedRelativeTime, FormattedTime, FormattedTimeParts, injectIntl, IntlContext, IntlProvider, RawIntlProvider, useIntl, } from 'react-intl';
+export { AtomRenderer } from './AtomRenderer';
 export { useSiteData } from './context';
 export { DumiDemo } from './DumiDemo';
 export { DumiDemoGrid } from './DumiDemoGrid';

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

@@ -1,4 +1,5 @@
 export { createIntlCache, defineMessages, FormattedDate, FormattedDateParts, FormattedDisplayName, FormattedList, FormattedMessage, FormattedNumber, FormattedNumberParts, FormattedPlural, FormattedRelativeTime, FormattedTime, FormattedTimeParts, injectIntl, IntlContext, IntlProvider, RawIntlProvider, useIntl } from 'react-intl';
+export { AtomRenderer } from "./AtomRenderer";
 export { useSiteData } from "./context";
 export { DumiDemo } from "./DumiDemo";
 export { DumiDemoGrid } from "./DumiDemoGrid";

package/dist/features/tabs.js

@@ -47,7 +47,7 @@ var tabs_default = (api) => {
       key: "addContentTab"
     });
     tabsFromPlugins.forEach((tab) => {
-      tab.id ?? (tab.id = `plugin-tab${tab.test ? `-${tab.test}` : ""}-${tab.key}`);
+      tab.id ?? (tab.id = `plugin-tab-${tab.key}`);
       tab.component = (0, import_plugin_utils.winPath)(tab.component);
     });
     return memo;
@@ -82,8 +82,8 @@ var tabs_default = (api) => {
         });
       }
     });
-    tabs.push(...tabsFromPlugins.map((tab) => ({
-      index: tabs.length,
+    tabs.push(...tabsFromPlugins.map((tab, index) => ({
+      index: tabs.length + index,
       key: tab.key,
       id: tab.id,
       file: tab.component

package/dist/features/theme/index.js

@@ -42,6 +42,12 @@ function getPkgThemePath(api) {
   const pkgThemeName = getPkgThemeName(api);
   return pkgThemeName && import_path.default.dirname(require.resolve(`${pkgThemeName}/package.json`, { paths: [api.cwd] }));
 }
+function getModuleExports(modulePath) {
+  return (0, import_bundler_utils.parseModuleSync)({
+    path: modulePath,
+    content: import_fs.default.readFileSync(modulePath, "utf-8")
+  })[1];
+}
 var theme_default = (api) => {
   const defaultThemeData = (0, import_loader.default)(DEFAULT_THEME_PATH);
   const pkgThemePath = getPkgThemePath(api);
@@ -60,7 +66,12 @@ var theme_default = (api) => {
       api.registerPlugins([plugin]);
     }
   });
-  (0, import_derivative.safeExcludeInMFSU)(api, ["dumi/theme-default", "@ant-design/icons-svg", getPkgThemeName(api)].filter(Boolean).map((pkg) => new RegExp(pkg)));
+  (0, import_derivative.safeExcludeInMFSU)(api, [
+    "dumi/theme-default",
+    "@ant-design/icons-svg",
+    "highlight-words-core",
+    getPkgThemeName(api)
+  ].filter(Boolean).map((pkg) => new RegExp(pkg)));
   api.register({
     key: "modifyAppData",
     before: "appData",
@@ -113,10 +124,7 @@ var theme_default = (api) => {
         if (item.source === "dumi")
           return;
         let contents = [];
-        const [, exports] = (0, import_bundler_utils.parseModuleSync)({
-          path: item.source,
-          content: import_fs.default.readFileSync(item.source, "utf-8")
-        });
+        const exports = getModuleExports(item.source);
         if (exports.includes("default")) {
           contents.push(`export { default } from '${item.source}';`);
         }
@@ -130,6 +138,10 @@ var theme_default = (api) => {
         });
       });
     });
+    const entryFile = api.config.resolve.entryFile && [import_path.default.resolve(api.cwd, api.config.resolve.entryFile)].find(import_fs.default.existsSync);
+    const entryExports = entryFile ? getModuleExports(entryFile) : [];
+    const hasDefaultExport = entryExports.includes("default");
+    const hasNamedExport = entryExports.some((exp) => exp !== "default");
     api.writeTmpFile({
       noPluginDir: true,
       path: "dumi/theme/ContextWrapper.tsx",
@@ -137,7 +149,14 @@ var theme_default = (api) => {
 import { useOutlet, history } from 'dumi';
 import { SiteContext } from '${(0, import_plugin_utils.winPath)(require.resolve("../../client/theme-api/context"))}';
 import { demos, components } from '../meta';
-import { locales } from '../locales/config';
+import { locales } from '../locales/config';${hasDefaultExport ? `
+import entryDefaultExport from '${(0, import_plugin_utils.winPath)(entryFile)}';` : ""}${hasNamedExport ? `
+import * as entryMemberExports from '${(0, import_plugin_utils.winPath)(entryFile)}';` : ""}
+
+const entryExports = {
+  ${hasDefaultExport ? "default: entryDefaultExport," : ""}
+  ${hasNamedExport ? "...entryMemberExports," : ""}
+};
 
 export default function DumiContextWrapper() {
   const outlet = useOutlet();
@@ -160,6 +179,7 @@ export default function DumiContextWrapper() {
   return (
     <SiteContext.Provider value={{
       pkg: ${JSON.stringify(import_plugin_utils.lodash.pick(api.pkg, ...Object.keys(import_constants.PICKED_PKG_FIELDS)))},
+      entryExports,
       demos,
       components,
       locales,

package/dist/loaders/markdown/index.js

@@ -137,6 +137,7 @@ function mdLoader(content) {
     ].join(":");
     cache.setSync(finalCacheKey, ret);
     cb(null, emit.call(this, opts, ret));
+    delete deferrer[cacheKey];
   }).catch(cb);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/loaders/markdown/transformer/remarkContainer.d.ts

@@ -1,3 +1,3 @@
 import type { Root } from 'mdast';
 import type { Transformer } from 'unified';
-export default function remarkContainer(): Transformer<Root>;
+export default function remarkContainer(this: any): Transformer<Root>;

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

@@ -32,6 +32,10 @@ var VALID_CONTAINER_TYPES = ["info", "warning", "success", "error"];
   ({ visit, SKIP } = await import("unist-util-visit"));
 })();
 function remarkContainer() {
+  const data = this.data();
+  const micromarkExtensions = data.micromarkExtensions.find(({ flow, text }) => flow && "58" in flow && text && "58" in text);
+  delete micromarkExtensions.text;
+  micromarkExtensions.flow["58"].splice(1, 1);
   return (tree) => {
     visit(tree, (node, i, parent) => {
       if (node.type === "containerDirective" && VALID_CONTAINER_TYPES.includes(node.name)) {

package/package.json

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

package/theme-default/slots/RtlSwitch/index.less

@@ -1,5 +1,11 @@
 @import '../LangSwitch/index.less';
 
+.@{prefix}-lang-switch {
+  + & {
+    margin-inline-start: 20px;
+  }
+}
+
 html[data-direction='rtl'] {
   direction: rtl;
 }