dumi 2.0.0-rc.3 → 2.0.0-rc.4

package/dist/assetParsers/block.js

@@ -43,7 +43,7 @@ async function parseBlockAsset(opts) {
     sources: {},
     frontmatter: null
   };
-  await (0, import_esbuild.build)({
+  const deferrer = (0, import_esbuild.build)({
     write: false,
     bundle: true,
     logLevel: "silent",
@@ -116,6 +116,10 @@ async function parseBlockAsset(opts) {
       }
     ]
   });
+  try {
+    await deferrer;
+  } catch {
+  }
   return result;
 }
 var block_default = parseBlockAsset;

package/dist/client/pages/404.js

@@ -1,2 +1,2 @@
 // allow customize 404 via theme slots
-export { default } from 'dumi/theme/slots/NotFound';
+export { default } from "dumi/theme/slots/NotFound";

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

@@ -2,7 +2,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 import { SP_ROUTE_PREFIX } from "../../constants";
 import { useSiteData } from 'dumi';
-import Previewer from 'dumi/theme/builtins/Previewer';
+import Previewer from "dumi/theme/builtins/Previewer";
 import React, { createElement } from 'react';
 export var DumiDemo = function DumiDemo(props) {
   var _useSiteData = useSiteData(),

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

@@ -11,7 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useLocation, useRouteMeta, useSiteData } from 'dumi';
-import ContentTabs from 'dumi/theme/slots/ContentTabs';
+import ContentTabs from "dumi/theme/slots/ContentTabs";
 import React, { useEffect, useState } from 'react';
 import { useTabQueryState } from "./useTabMeta";
 export var DumiPage = function DumiPage(props) {

package/dist/features/derivative.js

@@ -27,6 +27,7 @@ __export(derivative_exports, {
 });
 module.exports = __toCommonJS(derivative_exports);
 var import_constants = require("../constants");
+var import_bundler_utils = require("@umijs/bundler-utils");
 var import_assert = __toESM(require("assert"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -50,7 +51,20 @@ function getFilesByGlob(globExp, dir) {
 var derivative_default = (api) => {
   const dumiAbsDir = import_path.default.join(api.cwd, import_constants.LOCAL_DUMI_DIR);
   const strategies = {
-    appJS: getFilesByGlob.bind(null, "app.{js,jsx,ts,tsx}", dumiAbsDir),
+    async appJS() {
+      const [appJS] = getFilesByGlob("app.{js,jsx,ts,tsx}", dumiAbsDir);
+      if (appJS) {
+        const [, exports] = await (0, import_bundler_utils.parseModule)({
+          path: appJS,
+          content: import_fs.default.readFileSync(appJS, "utf-8")
+        });
+        return {
+          path: appJS,
+          exports
+        };
+      }
+      return null;
+    },
     globalCSS: getFilesByGlob.bind(null, "global.{css,less,scss,sass}", dumiAbsDir),
     globalJS: getFilesByGlob.bind(null, "global.{js,jsx,ts,tsx}", dumiAbsDir),
     overridesCSS: getFilesByGlob.bind(null, "overrides.{css,less,scss,sass}", dumiAbsDir)
@@ -89,19 +103,20 @@ var derivative_default = (api) => {
     memo.exportStatic || (memo.exportStatic = {});
     return memo;
   });
-  api.modifyAppData((memo) => {
-    Object.entries(strategies).forEach(([key, fn]) => {
-      memo[key] = fn();
-    });
+  api.modifyAppData(async (memo) => {
+    for (const [key, strategy] of Object.entries(strategies)) {
+      memo[key] = await strategy();
+    }
     return memo;
   });
-  api.onGenerateFiles(() => {
-    Object.entries(strategies).forEach(([key, fn]) => {
-      api.appData[key] = fn();
-    });
-  });
-  api.addRuntimePlugin(() => {
-    return strategies.appJS().slice(0, 1);
+  api.register({
+    key: "onGenerateFiles",
+    stage: -Infinity,
+    async fn() {
+      for (const [key, strategy] of Object.entries(strategies)) {
+        api.appData[key] = await strategy();
+      }
+    }
   });
   api.registerPlugins([require.resolve("@umijs/plugins/dist/analytics")]);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",
@@ -25,7 +25,7 @@
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "npm run build && node ./bin/dumi.js setup && npm run docs:sync",
+    "prepare": "husky install && npm run build && node ./bin/dumi.js setup && npm run docs:sync",
     "prepublishOnly": "npm run build",
     "test": "vitest"
   },
@@ -57,9 +57,9 @@
     "@swc/core": "^1.2.224",
     "@types/hast": "^2.3.4",
     "@types/mdast": "^3.0.10",
-    "@umijs/bundler-utils": "^4.0.29",
-    "@umijs/core": "^4.0.29",
-    "@umijs/plugins": "^4.0.29",
+    "@umijs/bundler-utils": "^4.0.30",
+    "@umijs/core": "^4.0.30",
+    "@umijs/plugins": "^4.0.30",
     "codesandbox": "^2.2.3",
     "deepmerge": "^4.2.2",
     "dumi-afx-deps": "^1.0.0-alpha.1",
@@ -96,7 +96,7 @@
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.1.0",
     "sass": "^1.55.0",
-    "umi": "^4.0.29",
+    "umi": "^4.0.30",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.0",
     "unist-util-visit-parents": "^5.1.1",
@@ -116,7 +116,7 @@
     "@types/react": "^18.0.16",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-helmet": "^6.1.5",
-    "@umijs/lint": "^4.0.29",
+    "@umijs/lint": "^4.0.30",
     "eslint": "^8.20.0",
     "father": "^4.1.0",
     "husky": "^8.0.1",

package/theme-default/builtins/Previewer/index.js

@@ -1,7 +1,7 @@
 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 { useLocation } from 'dumi';
-import PreviewerActions from 'dumi/theme/slots/PreviewerActions';
+import PreviewerActions from "dumi/theme/slots/PreviewerActions";
 import React from 'react';
 import "./index.less";
 

package/theme-default/layouts/DocLayout/index.js

@@ -12,13 +12,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { ReactComponent as IconSidebar } from '@ant-design/icons-svg/inline-svg/outlined/align-left.svg';
 import { useIntl, useOutlet, useRouteMeta, useSidebarData } from 'dumi';
-import Content from 'dumi/theme/slots/Content';
-import Features from 'dumi/theme/slots/Features';
-import Footer from 'dumi/theme/slots/Footer';
-import Header from 'dumi/theme/slots/Header';
-import Hero from 'dumi/theme/slots/Hero';
-import Sidebar from 'dumi/theme/slots/Sidebar';
-import Toc from 'dumi/theme/slots/Toc';
+import Content from "dumi/theme/slots/Content";
+import Features from "dumi/theme/slots/Features";
+import Footer from "dumi/theme/slots/Footer";
+import Header from "dumi/theme/slots/Header";
+import Hero from "dumi/theme/slots/Hero";
+import Sidebar from "dumi/theme/slots/Sidebar";
+import Toc from "dumi/theme/slots/Toc";
 import React, { useState } from 'react';
 import Helmet from 'react-helmet';
 import "./index.less";

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

@@ -9,9 +9,19 @@
   padding: 0 @s-content-padding;
   border-bottom: 1px solid @c-border-light;
 
+  @media @mobile {
+    margin: -24px -24px 24px;
+    padding: 0 24px;
+    height: 42px;
+  }
+
   [data-no-sidebar] & {
     margin: 0 0 @s-content-padding;
     padding: 0;
+
+    @media @mobile {
+      margin-bottom: 24px;
+    }
   }
 
   > li {
@@ -34,6 +44,10 @@
 
     &:not(last-child) {
       margin-right: 42px;
+
+      @media @mobile {
+        margin-right: 20px;
+      }
     }
 
     &[data-active] {

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

@@ -13,10 +13,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ReactComponent as IconClose } from '@ant-design/icons-svg/inline-svg/outlined/close.svg';
 import { ReactComponent as IconMenu } from '@ant-design/icons-svg/inline-svg/outlined/menu.svg';
 import { useRouteMeta } from 'dumi';
-import LangSwitch from 'dumi/theme/slots/LangSwitch';
-import Logo from 'dumi/theme/slots/Logo';
-import Navbar from 'dumi/theme/slots/Navbar';
-import SearchBar from 'dumi/theme/slots/SearchBar';
+import LangSwitch from "dumi/theme/slots/LangSwitch";
+import Logo from "dumi/theme/slots/Logo";
+import Navbar from "dumi/theme/slots/Navbar";
+import SearchBar from "dumi/theme/slots/SearchBar";
 import React, { useState } from 'react';
 import "./index.less";
 

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

@@ -1,5 +1,5 @@
 import { Link, useRouteMeta } from 'dumi';
-import HeroTitle from 'dumi/theme/slots/HeroTitle';
+import HeroTitle from "dumi/theme/slots/HeroTitle";
 import React from 'react';
 import "./index.less";
 

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

@@ -15,7 +15,11 @@ var Navbar = function Navbar() {
   }, nav.map(function (item) {
     return /*#__PURE__*/React.createElement("li", {
       key: item.link
-    }, /*#__PURE__*/React.createElement(Link, _extends({
+    }, /^(\w+:)\/\/|^(mailto|tel):/.test(item.link) ? /*#__PURE__*/React.createElement("a", {
+      href: item.link,
+      target: "_blank",
+      rel: "noreferrer"
+    }, item.title) : /*#__PURE__*/React.createElement(Link, _extends({
       to: item.link
     }, pathname.startsWith(item.activePath || item.link) ? {
       className: 'active'

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

@@ -13,8 +13,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ReactComponent as IconCodeSandbox } from '@ant-design/icons-svg/inline-svg/outlined/code-sandbox.svg'; // import { ReactComponent as IconCodePen } from '@ant-design/icons-svg/inline-svg/outlined/codepen.svg';
 
 import { openCodeSandbox, useIntl } from 'dumi';
-import SourceCode from 'dumi/theme/builtins/SourceCode';
-import PreviewerActionsExtra from 'dumi/theme/slots/PreviewerActionsExtra';
+import SourceCode from "dumi/theme/builtins/SourceCode";
+import PreviewerActionsExtra from "dumi/theme/slots/PreviewerActionsExtra";
 import Tabs from 'rc-tabs';
 import React, { useState } from 'react';
 import "./index.less";

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

@@ -1,5 +1,5 @@
 import { NavLink, useLocation, useRouteMeta, useSidebarData } from 'dumi';
-import Toc from 'dumi/theme/slots/Toc';
+import Toc from "dumi/theme/slots/Toc";
 import React from 'react';
 import "./index.less";