dumi 2.4.7 → 2.4.8-beta.1

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

@@ -174,7 +174,7 @@ export interface ISidebarGroup {
     children: ISidebarItem[];
     [key: string]: any;
 }
-export type SocialTypes = 'github' | 'weibo' | 'twitter' | 'gitlab' | 'facebook' | 'zhihu' | 'yuque' | 'linkedin';
+export type SocialTypes = 'github' | 'weibo' | 'twitter' | 'x' | 'gitlab' | 'facebook' | 'zhihu' | 'yuque' | 'linkedin';
 export type INavItems = (INavItem & {
     children?: INavItem[];
 })[];

package/dist/features/compile/index.js

@@ -104,9 +104,6 @@ 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

@@ -49,6 +49,9 @@ function getDemoSourceFiles(demos = []) {
     return ret;
   }, []);
 }
+function isRelativePath(path2) {
+  return path2.startsWith("./") || path2.startsWith("../");
+}
 function emitDefault(opts, ret) {
   const { frontmatter, demos } = ret.meta;
   const isTabContent = (0, import_tabs.isTabRouteFile)(this.resourcePath);
@@ -89,9 +92,45 @@ export default DumiMarkdownContent;`;
 }
 function emitDemo(opts, ret) {
   const { demos } = ret.meta;
+  const shareDepsMap = {};
+  const demoDepsMap = {};
+  demos == null ? void 0 : demos.forEach((demo) => {
+    var _a;
+    if ("resolveMap" in demo && "asset" in demo) {
+      const entryFileName = Object.keys(demo.asset.dependencies)[0];
+      demoDepsMap[_a = demo.id] ?? (demoDepsMap[_a] = {});
+      Object.keys(demo.resolveMap).forEach((key, index) => {
+        const specifier = `${demo.id.replace(/-/g, "_")}_deps_${index}`;
+        if (key !== entryFileName && !isRelativePath(key)) {
+          if (shareDepsMap[key]) {
+            demoDepsMap[demo.id][key] = shareDepsMap[key];
+          } else {
+            demoDepsMap[demo.id][key] = specifier;
+            shareDepsMap[key] = specifier;
+          }
+        } else if (isRelativePath(key)) {
+          demoDepsMap[demo.id][demo.resolveMap[key]] = specifier;
+        }
+      });
+    }
+  });
+  const dedupedDemosDeps = Object.entries(demoDepsMap).reduce((acc, [, deps]) => {
+    return acc.concat(
+      Object.entries(deps).map(([key, specifier]) => {
+        const existingIndex = acc.findIndex((obj) => obj.key === key);
+        if (existingIndex === -1) {
+          return { key, specifier };
+        }
+        return void 0;
+      }).filter((item) => item !== void 0)
+    );
+  }, []);
   return import_plugin_utils.Mustache.render(
     `import React from 'react';
-     import '${(0, import_plugin_utils.winPath)(this.getDependencies()[0])}?watch=parent';
+import '${(0, import_plugin_utils.winPath)(this.getDependencies()[0])}?watch=parent';
+{{#dedupedDemosDeps}}
+import * as {{{specifier}}} from '{{{key}}}';
+{{/dedupedDemosDeps}}
 export const demos = {
   {{#demos}}
   '{{{id}}}': {
@@ -106,6 +145,7 @@ export const demos = {
 };`,
     {
       demos,
+      dedupedDemosDeps,
       renderAsset: function renderAsset() {
         if (!("asset" in this))
           return "null";
@@ -127,14 +167,10 @@ export const demos = {
       renderContext: function renderContext() {
         if (!("resolveMap" in this) || !("asset" in this))
           return "undefined";
-        const entryFileName = Object.keys(this.asset.dependencies)[0];
-        const context = Object.entries(this.resolveMap).reduce(
-          (acc, [key, path2]) => ({
+        const context = Object.entries(demoDepsMap[this.id]).reduce(
+          (acc, [key, specifier]) => ({
             ...acc,
-            // omit entry file
-            ...key !== entryFileName ? {
-              [key]: `{{{require('${path2}')}}}`
-            } : {}
+            ...{ [key]: `{{{${specifier}}}}` }
           }),
           {}
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.7",
+  "version": "2.4.8-beta.1",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -59,7 +59,7 @@
     ]
   },
   "dependencies": {
-    "@ant-design/icons-svg": "^4.2.1",
+    "@ant-design/icons-svg": "^4.4.2",
     "@makotot/ghostui": "^2.0.0",
     "@stackblitz/sdk": "^1.9.0",
     "@swc/core": "1.4.2",

package/theme-default/locales/en-US.json

@@ -6,6 +6,7 @@
   "header.social.github": "GitHub",
   "header.social.weibo": "Weibo",
   "header.social.twitter": "Twitter",
+  "header.social.x": "X",
   "header.social.gitlab": "GitLab",
   "header.social.facebook": "Facebook",
   "header.social.zhihu": "Zhihu",

package/theme-default/locales/zh-CN.json

@@ -6,6 +6,7 @@
   "header.social.github": "GitHub",
   "header.social.weibo": "微博",
   "header.social.twitter": "Twitter",
+  "header.social.x": "X",
   "header.social.gitlab": "GitLab",
   "header.social.facebook": "Facebook",
   "header.social.zhihu": "知乎",

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

@@ -2,8 +2,8 @@ import { ReactComponent as IconFacebook } from '@ant-design/icons-svg/inline-svg
 import { ReactComponent as IconGitHub } from '@ant-design/icons-svg/inline-svg/outlined/github.svg';
 import { ReactComponent as IconGitlab } from '@ant-design/icons-svg/inline-svg/outlined/gitlab.svg';
 import { ReactComponent as IconLinkedin } from '@ant-design/icons-svg/inline-svg/outlined/linkedin.svg';
-import { ReactComponent as IconTwitter } from '@ant-design/icons-svg/inline-svg/outlined/twitter.svg';
 import { ReactComponent as IconWeiBo } from '@ant-design/icons-svg/inline-svg/outlined/weibo.svg';
+import { ReactComponent as IconX } from '@ant-design/icons-svg/inline-svg/outlined/x.svg';
 import { ReactComponent as IconYuque } from '@ant-design/icons-svg/inline-svg/outlined/yuque.svg';
 import { ReactComponent as IconZhihu } from '@ant-design/icons-svg/inline-svg/outlined/zhihu.svg';
 import React, { useMemo } from 'react';
@@ -12,7 +12,8 @@ import "./index.less";
 var presetIconMap = {
   github: IconGitHub,
   weibo: IconWeiBo,
-  twitter: IconTwitter,
+  twitter: IconX,
+  x: IconX,
   gitlab: IconGitlab,
   facebook: IconFacebook,
   zhihu: IconZhihu,

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

@@ -81,7 +81,8 @@ var SourceCodeEditor = function SourceCodeEditor(props) {
       },
       autoComplete: "off",
       autoCorrect: "off",
-      autoSave: "off"
+      autoSave: "off",
+      spellCheck: "false"
     }),
     extra: style && props.extra
   }), code));