dumi 2.1.17 → 2.1.18

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

@@ -22,7 +22,8 @@ var DemoErrorBoundary = function DemoErrorBoundary(props) {
 
 export var DumiDemo = function DumiDemo(props) {
   var _useSiteData = useSiteData(),
-      demos = _useSiteData.demos;
+      demos = _useSiteData.demos,
+      historyType = _useSiteData.historyType;
 
   var _useAppData = useAppData(),
       basename = _useAppData.basename;
@@ -37,9 +38,11 @@ export var DumiDemo = function DumiDemo(props) {
     return /*#__PURE__*/React.createElement(DemoErrorBoundary, null, /*#__PURE__*/createElement(component));
   }
 
+  var isHashRoute = historyType === 'hash';
   return /*#__PURE__*/React.createElement(Previewer, _extends({
     asset: asset,
     demoUrl: // allow user override demoUrl by frontmatter
-    props.previewerProps.demoUrl || "".concat(basename).concat(SP_ROUTE_PREFIX, "demos/").concat(props.demo.id)
+    props.previewerProps.demoUrl || // when use hash route, browser can automatically handle relative paths starting with #
+    "".concat(isHashRoute ? "#" : '').concat(basename).concat(SP_ROUTE_PREFIX, "demos/").concat(props.demo.id)
   }, props.previewerProps), props.previewerProps.iframe ? null : /*#__PURE__*/React.createElement(DemoErrorBoundary, null, /*#__PURE__*/createElement(component)));
 };

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>>;
+    historyType: 'browser' | 'hash' | 'memory';
     entryExports: Record<string, any>;
     demos: Record<string, {
         component: ComponentType;

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

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

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

@@ -1,5 +1,5 @@
-import type { IUserNavItems } from './types';
+import type { INavItems } from './types';
 /**
  * hook for get nav data
  */
-export declare const useNavData: () => IUserNavItems;
+export declare const useNavData: () => INavItems;

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

@@ -21,10 +21,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useFullSidebarData, useLocale, useSiteData } from 'dumi';
 import { useState } from 'react';
 import { getLocaleNav, pickRouteSortMeta, useLocaleDocRoutes, useRouteDataComparer } from "./utils";
-
 /**
  * hook for get nav data
  */
+
 export var useNavData = function useNavData() {
   var locale = useLocale();
   var routes = useLocaleDocRoutes();

package/dist/features/derivative.js

@@ -32,7 +32,7 @@ var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 function isMFSUAvailable(api) {
-  return process.platform !== "win32" && api.userConfig.mfsu !== false;
+  return process.platform !== "win32" && api.userConfig.mfsu !== false && api.pkg.type !== "module";
 }
 function safeExcludeInMFSU(api, excludes) {
   if (isMFSUAvailable(api)) {
@@ -52,17 +52,29 @@ function safeExcludeInMFSU(api, excludes) {
 var derivative_default = (api) => {
   api.describe({ key: "dumi:derivative" });
   api.onCheck(() => {
-    var _a, _b, _c, _d;
-    (0, import_assert.default)(!api.config.mpa, "MPA mode is not supported in dumi!");
-    (0, import_assert.default)(!api.config.vite, "Vite mode is not supported yet!");
-    (0, import_assert.default)(!api.config.phantomDependency, "PhantomDependency is not supported yet!");
+    var _a, _b, _c;
+    [
+      "clientLoader",
+      "deadCode",
+      "icons",
+      "mdx",
+      "mpa",
+      "monorepoRedirect",
+      "reactRouter5Compat",
+      "verifyCommit"
+    ].forEach((key) => {
+      (0, import_assert.default)(!api.config[key], `${key} is not supported in dumi!`);
+    });
+    ["vite", "PhantomDependency"].forEach((key) => {
+      (0, import_assert.default)(!api.config[key], `${key} is not supported yet!`);
+    });
     if (typeof api.config.mfsu === "object") {
       (0, import_assert.default)(api.config.mfsu.strategy !== "eager", "MFSU eager mode is not supported yet!");
       (0, import_assert.default)(api.config.mfsu.esbuild !== true, "MFSU esbuild bundler is not supported yet!");
     }
     (0, import_assert.default)(!api.config.ssr || api.config.ssr.builder === "webpack", "Only `webpack` builder is supported in SSR mode!");
-    (0, import_assert.default)(((_a = api.config.cssLoader) == null ? void 0 : _a.modules) === void 0, "CSS Modules is not supported! Because it is not suitable for UI library development, please use normal CSS, Less, etc. instead.");
-    if (((_b = api.userConfig.history) == null ? void 0 : _b.type) === "hash") {
+    (0, import_assert.default)(((_a = api.config.cssLoader) == null ? void 0 : _a.modules) === void 0 && api.config.cssLoaderModules === void 0, "CSS Modules is not supported! Because it is not suitable for UI library development, please use normal CSS, Less, etc. instead.");
+    if (api.userConfig.history && api.userConfig.history.type === "hash") {
       import_plugin_utils.logger.warn("Hash history is temporarily incompatible, it is recommended to use browser history for now.");
     }
     const { themeConfig } = api.config;
@@ -75,7 +87,7 @@ var derivative_default = (api) => {
     try {
       const tsconfig = require(import_path.default.join(api.cwd, "tsconfig.json"));
       const expected = [".dumi/**/*"];
-      if ((_d = (_c = api.service.configManager) == null ? void 0 : _c.mainConfigFile) == null ? void 0 : _d.endsWith(".ts")) {
+      if ((_c = (_b = api.service.configManager) == null ? void 0 : _b.mainConfigFile) == null ? void 0 : _c.endsWith(".ts")) {
         expected.push((0, import_plugin_utils.winPath)(import_path.default.relative(api.cwd, api.service.configManager.mainConfigFile)));
       }
       if (!expected.every((f) => {
@@ -112,6 +124,7 @@ var derivative_default = (api) => {
     }
     memo.hash = true;
     memo.exportStatic || (memo.exportStatic = {});
+    memo.esbuildMinifyIIFE = true;
     return memo;
   });
   api.modifyConfig((memo) => {
@@ -134,30 +147,16 @@ var derivative_default = (api) => {
       import_constants.USELESS_TMP_FILES.forEach((file) => {
         import_plugin_utils.fsExtra.rmSync(import_path.default.join(api.paths.absTmpPath, file), { force: true });
       });
-      const umiPath = import_path.default.join(api.paths.absTmpPath, "umi.ts");
-      import_plugin_utils.fsExtra.writeFileSync(umiPath, import_plugin_utils.fsExtra.readFileSync(umiPath, "utf-8").replace("'@/loading'", "'../loading'"));
-      if (api.config.ssr && import_plugin_utils.semver.subset(api.appData.umi.version, "4.0.54 - 4.0.55")) {
-        const helmetPath = import_path.default.join(api.paths.absTmpPath, "core/helmet.ts");
-        import_plugin_utils.fsExtra.writeFileSync(helmetPath, import_plugin_utils.fsExtra.readFileSync(helmetPath, "utf-8").replace(/(return )(React\.createElement)/, "$1typeof window === 'undefined' ? container : $2"));
-      }
     }
   });
   api.registerPlugins([require.resolve("../../compiled/@umijs/plugins")]);
-  if (api.isPluginEnable("prepare"))
-    api.skipPlugins(["prepare"]);
-  if (api.isPluginEnable("routeProps")) {
-    api.skipPlugins(["routeProps"]);
-    api.onGenerateFiles({
-      stage: -Infinity,
-      fn() {
-        api.writeTmpFile({
-          noPluginDir: true,
-          path: "core/routeProps.js",
-          content: "export default {}"
-        });
-      }
-    });
-  }
+  [
+    "prepare",
+    "routeProps"
+  ].forEach((plugin) => {
+    if (api.isPluginEnable(plugin))
+      api.skipPlugins([plugin]);
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/theme/index.js

@@ -138,6 +138,7 @@ var theme_default = (api) => {
     return memo;
   });
   api.onGenerateFiles(() => {
+    var _a;
     themeMapKeys.forEach((key) => {
       Object.values(originalThemeData[key] || {}).forEach((item) => {
         if (item.source === "dumi")
@@ -199,6 +200,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)))},
+      historyType: "${((_a = api.config.history) == null ? void 0 : _a.type) || "browser"}",
       entryExports,
       demos,
       components,

package/dist/service/cli.js

@@ -28,6 +28,7 @@ var import_constants = require("./constants");
 var import_dev = require("./dev");
 var import_printHelp = require("./printHelp");
 var import_service = require("./service");
+(0, import_node.catchUnhandledRejection)();
 async function run(opts) {
   (0, import_node.checkVersion)();
   (0, import_node.setNodeTitle)(import_constants.FRAMEWORK_NAME);

package/dist/techStacks/react.js

@@ -26,102 +26,6 @@ __export(react_exports, {
 });
 module.exports = __toCommonJS(react_exports);
 var import_core = require("@swc/core");
-var import_Visitor = __toESM(require("@swc/core/Visitor"));
-function createReturnStmt(exp, span) {
-  return {
-    type: "ReturnStatement",
-    span,
-    argument: {
-      type: "ObjectExpression",
-      span,
-      properties: [
-        {
-          type: "KeyValueProperty",
-          key: {
-            type: "Identifier",
-            span,
-            value: "default",
-            optional: false
-          },
-          value: exp
-        }
-      ]
-    }
-  };
-}
-var ReactDemoVisitor = class extends import_Visitor.default {
-  visitImportDeclaration(n) {
-    if (!n.typeOnly) {
-      const namespaceImport = n.specifiers.find((s) => s.type === "ImportNamespaceSpecifier");
-      const id = namespaceImport ? namespaceImport.local : {
-        type: "ObjectPattern",
-        span: n.span,
-        properties: n.specifiers.map((s) => {
-          var _a;
-          if (s.type === "ImportDefaultSpecifier" || s.type === "ImportSpecifier" && ((_a = s.imported) == null ? void 0 : _a.type) === "Identifier") {
-            return {
-              type: "KeyValuePatternProperty",
-              span: s.span,
-              key: s.type === "ImportSpecifier" ? s.imported : {
-                type: "Identifier",
-                span: s.span,
-                value: "default",
-                optional: false
-              },
-              value: s.local
-            };
-          }
-          return {
-            type: "AssignmentPatternProperty",
-            span: s.span,
-            key: s.local
-          };
-        }),
-        optional: false
-      };
-      return {
-        type: "VariableDeclaration",
-        kind: "const",
-        declare: false,
-        span: n.span,
-        declarations: [
-          {
-            type: "VariableDeclarator",
-            span: n.span,
-            definite: false,
-            id,
-            init: {
-              span: n.span,
-              type: "AwaitExpression",
-              argument: {
-                type: "CallExpression",
-                span: n.span,
-                callee: {
-                  type: "Import",
-                  span: n.span
-                },
-                arguments: [{ expression: n.source }]
-              }
-            }
-          }
-        ]
-      };
-    }
-    return n;
-  }
-  visitExportDefaultDeclaration(n) {
-    if (n.decl.type !== "TsInterfaceDeclaration") {
-      return createReturnStmt(n.decl, n.span);
-    }
-    return n;
-  }
-  visitExportDefaultExpression(n) {
-    return createReturnStmt(n.expression, n.span);
-  }
-  visitTsType(n) {
-    return n;
-  }
-};
 var ReactTechStack = class {
   constructor() {
     this.name = "react";
@@ -139,12 +43,20 @@ var ReactTechStack = class {
             syntax: isTSX ? "typescript" : "ecmascript",
             [isTSX ? "tsx" : "jsx"]: true
           },
-          target: "es2022"
+          target: "es2022",
+          experimental: {
+            cacheRoot: "node_modules/.cache/swc",
+            plugins: [
+              [
+                require.resolve("../../compiled/crates/swc_plugin_react_demo.wasm"),
+                {}
+              ]
+            ]
+          }
         },
         module: {
           type: "es6"
-        },
-        plugin: (m) => new ReactDemoVisitor().visitProgram(m)
+        }
       });
       return `React.lazy(async () => {
 ${code}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.1.17",
+  "version": "2.1.18",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -35,10 +35,10 @@
     "plugin-utils.d.ts"
   ],
   "scripts": {
-    "build": "father build",
+    "build": "father build && npm run build:crates",
+    "build:crates": "cargo build --target wasm32-wasi -r --out-dir compiled/crates -Z unstable-options",
     "build:deps": "node scripts/pre-bundle-worker.js && father prebundle",
     "build:suites": "pnpm run --filter=\"./suites/**\" build",
-    "custom-install": "pnpm i",
     "dev": "father dev",
     "docs:build": "node ./bin/dumi.js build",
     "docs:dev": "node ./bin/dumi.js dev",
@@ -49,7 +49,9 @@
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
     "prepare": "husky install && npm run build && npm run build:suites && node ./bin/dumi.js setup && npm run docs:sync",
     "prepublishOnly": "npm run build",
-    "test": "vitest"
+    "test": "vitest",
+    "vercel:build": "npm run docs:build",
+    "vercel:install": "./scripts/vercel-install.sh"
   },
   "commitlint": {
     "extends": [
@@ -77,11 +79,11 @@
     "@ant-design/icons-svg": "^4.2.1",
     "@makotot/ghostui": "^2.0.0",
     "@stackblitz/sdk": "^1.8.1",
-    "@swc/core": "^1.2.224",
+    "@swc/core": "^1.3.42",
     "@types/hast": "^2.3.4",
     "@types/mdast": "^3.0.10",
-    "@umijs/bundler-utils": "^4.0.59",
-    "@umijs/core": "^4.0.59",
+    "@umijs/bundler-utils": "^4.0.64",
+    "@umijs/core": "^4.0.64",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox": "^2.2.3",
@@ -122,7 +124,7 @@
     "remark-rehype": "^10.1.0",
     "sass": "^1.55.0",
     "sitemap": "^7.1.1",
-    "umi": "^4.0.59",
+    "umi": "^4.0.64",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.0",
     "unist-util-visit-parents": "^5.1.1",
@@ -141,7 +143,7 @@
     "@types/pluralize": "^0.0.29",
     "@types/react": "^18.0.16",
     "@types/react-copy-to-clipboard": "^5.0.4",
-    "@umijs/lint": "^4.0.59",
+    "@umijs/lint": "^4.0.64",
     "@umijs/plugins": "4.0.32",
     "dumi-theme-mobile": "workspace:*",
     "eslint": "^8.20.0",

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

@@ -80,9 +80,12 @@ var HANDLERS = {
     var _this2 = this;
 
     var signature = _ref3.signature;
-    return "".concat(signature.isAsync ? 'async ' : '', "(").concat(signature.arguments.map(function (arg) {
-      return "".concat(arg.key, ": ").concat(_this2.toString(arg));
-    }).join(', '), ") => ").concat(this.toString(signature.returnType));
+    var signatures = 'oneOf' in signature ? signature.oneOf : [signature];
+    return signatures.map(function (signature) {
+      return "".concat(signature.isAsync ? 'async ' : '', "(").concat(signature.arguments.map(function (arg) {
+        return "".concat(arg.key, ": ").concat(_this2.toString(arg));
+      }).join(', '), ") => ").concat(_this2.toString(signature.returnType));
+    }).join(' | ');
   },
   // FIXME: extract real type
   dom: function dom(prop) {

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

@@ -30,7 +30,8 @@ var SIMILAR_DSL = {
 };
 
 var SourceCode = function SourceCode(props) {
-  var children = props.children,
+  var _props$children = props.children,
+      children = _props$children === void 0 ? '' : _props$children,
       lang = props.lang,
       _props$highlightLines = props.highlightLines,
       highlightLines = _props$highlightLines === void 0 ? [] : _props$highlightLines;

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

@@ -20,8 +20,8 @@ import Logo from 'dumi/theme/slots/Logo';
 import Navbar from 'dumi/theme/slots/Navbar';
 import RtlSwitch from 'dumi/theme/slots/RtlSwitch';
 import SearchBar from 'dumi/theme/slots/SearchBar';
+import SocialIcon from 'dumi/theme/slots/SocialIcon';
 import React, { useMemo, useState } from 'react';
-import SocialIcon from "../SocialIcon";
 import "./index.less";
 
 var Header = function Header() {