dumi 2.0.0-beta.14 → 2.0.0-beta.15

package/dist/assetParsers/block.d.ts

@@ -1,5 +1,6 @@
 import { parseCodeFrontmatter } from "../utils";
 import type { ExampleBlockAsset } from 'dumi-assets-types';
+import type { sync } from 'enhanced-resolve';
 export interface IParsedBlockAsset {
     asset: ExampleBlockAsset;
     sources: Record<string, string>;
@@ -10,5 +11,6 @@ declare function parseBlockAsset(opts: {
     id: string;
     refAtomIds: string[];
     entryPointCode?: string;
+    resolver: typeof sync;
 }): Promise<IParsedBlockAsset>;
 export default parseBlockAsset;

package/dist/assetParsers/block.js

@@ -27,6 +27,7 @@ __export(block_exports, {
 module.exports = __toCommonJS(block_exports);
 var import_utils = require("../utils");
 var import_esbuild = require("@umijs/bundler-utils/compiled/esbuild");
+var import_assert = __toESM(require("assert"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
@@ -56,8 +57,10 @@ async function parseBlockAsset(opts) {
         setup: (builder) => {
           builder.onResolve({ filter: /.*/ }, (args) => {
             if (args.kind !== "entry-point" && !args.path.startsWith(".")) {
+              const resolved = opts.resolver(args.resolveDir, args.path);
+              (0, import_assert.default)(resolved, `Can't resolve ${args.path} from ${args.resolveDir}`);
               const pkgJsonPath = import_plugin_utils.pkgUp.pkgUpSync({
-                cwd: require.resolve(args.path, { paths: [args.resolveDir] })
+                cwd: resolved
               });
               if (pkgJsonPath) {
                 asset.dependencies[args.path] = {

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

@@ -61,8 +61,8 @@ export interface IRouteMeta {
             title?: string;
             description?: string;
             background?: string;
-            links?: {
-                title: string;
+            actions?: {
+                text: string;
                 link: string;
             }[];
             [key: string]: any;
@@ -116,11 +116,11 @@ declare type IBasicLocale = {
     id: string;
     name: string;
 };
-export declare type ILocale = ((IBasicLocale & {
+export declare type ILocale = (IBasicLocale & {
     base: string;
 }) | (IBasicLocale & {
     suffix: string;
-}));
+});
 export declare type ILocalesConfig = ILocale[];
 export interface INavItem {
     title: string;

package/dist/features/compile.js

@@ -33,10 +33,6 @@ var compile_default = (api) => {
     stage: Infinity,
     fn: () => new import_react.default()
   });
-  api.modifyDefaultConfig((memo) => {
-    memo.alias.dumi$ = memo.alias.umi;
-    return memo;
-  });
   api.chainWebpack(async (memo) => {
     const babelInUmi = memo.module.rule("src").use("babel-loader").entries();
     const techStacks = await api.applyPlugins({

package/dist/features/derivative.d.ts

@@ -1,4 +1,9 @@
 import type { IApi } from "../types";
+/**
+ * exclude pre-compiling modules in mfsu mode
+ * and make sure there has no multiple instances problem (such as react)
+ */
+export declare function safeExcludeInMFSU(api: IApi, excludes: RegExp[]): void;
 /**
  * plugin for derive default behaviors from umi
  */

package/dist/features/derivative.js

@@ -22,12 +22,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/features/derivative.ts
 var derivative_exports = {};
 __export(derivative_exports, {
-  default: () => derivative_default
+  default: () => derivative_default,
+  safeExcludeInMFSU: () => safeExcludeInMFSU
 });
 module.exports = __toCommonJS(derivative_exports);
 var import_constants = require("../constants");
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
+function safeExcludeInMFSU(api, excludes) {
+  if (api.userConfig.mfsu !== false) {
+    api.modifyDefaultConfig((memo) => {
+      memo.mfsu ?? (memo.mfsu = {});
+      memo.mfsu.exclude = (0, import_plugin_utils.deepmerge)(memo.mfsu.exclude || [], excludes);
+      memo.extraBabelIncludes ?? (memo.extraBabelIncludes = []);
+      memo.extraBabelIncludes.push(...excludes);
+      return memo;
+    });
+  }
+}
 function getFilesByGlob(globExp, dir) {
   return import_plugin_utils.glob.sync(globExp, { cwd: dir }).map((file) => (0, import_plugin_utils.winPath)(import_path.default.join(dir, file)));
 }
@@ -40,6 +52,13 @@ var derivative_default = (api) => {
     overridesCSS: getFilesByGlob.bind(null, "overrides.{css,less,scss,sass}", dumiAbsDir)
   };
   api.describe({ key: "dumi:derivative" });
+  safeExcludeInMFSU(api, [new RegExp("dumi/dist/client")]);
+  api.modifyDefaultConfig((memo) => {
+    if (api.userConfig.mfsu !== false) {
+      memo.mfsu.strategy = "normal";
+    }
+    return memo;
+  });
   api.modifyAppData((memo) => {
     Object.entries(strategies).forEach(([key, fn]) => {
       memo[key] = fn();
@@ -56,4 +75,6 @@ var derivative_default = (api) => {
   });
 };
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  safeExcludeInMFSU
+});

package/dist/features/exports.d.ts

@@ -1,8 +1,3 @@
 import type { IApi } from "../types";
-/**
- * exclude pre-compiling modules in mfsu mode
- * and make sure there has no multiple instances problem (such as react)
- */
-export declare function safeExcludeInMFSU(api: IApi, excludes: RegExp[]): void;
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/features/exports.js

@@ -22,31 +22,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/features/exports.ts
 var exports_exports = {};
 __export(exports_exports, {
-  default: () => exports_default,
-  safeExcludeInMFSU: () => safeExcludeInMFSU
+  default: () => exports_default
 });
 module.exports = __toCommonJS(exports_exports);
 var import_plugin_utils = require("umi/plugin-utils");
-function safeExcludeInMFSU(api, excludes) {
-  if (api.userConfig.mfsu !== false) {
-    api.modifyDefaultConfig((memo) => {
-      memo.mfsu ?? (memo.mfsu = {});
-      memo.mfsu.exclude = (0, import_plugin_utils.deepmerge)(memo.mfsu.exclude || [], excludes);
-      memo.extraBabelIncludes ?? (memo.extraBabelIncludes = []);
-      memo.extraBabelIncludes.push(...excludes);
-      return memo;
-    });
-  }
-}
 var exports_default = (api) => {
-  api.describe({ key: void 0 });
-  safeExcludeInMFSU(api, [new RegExp("dumi/dist/client")]);
-  api.modifyDefaultConfig((memo) => {
-    if (api.userConfig.mfsu !== false) {
-      memo.mfsu = { strategy: "normal" };
-    }
-    return memo;
-  });
+  api.describe({ key: "dumi:exports" });
   api.modifyConfig((memo) => {
     memo.alias["dumi$"] = "@@/dumi/exports";
     return memo;
@@ -61,6 +42,4 @@ export * from '${(0, import_plugin_utils.winPath)(require.resolve("../client/the
   });
 };
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  safeExcludeInMFSU
-});
+0 && (module.exports = {});

package/dist/features/theme/index.js

@@ -29,7 +29,7 @@ var import_constants = require("../../constants");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
-var import_exports = require("../exports");
+var import_derivative = require("../derivative");
 var import_loader = __toESM(require("./loader"));
 var DEFAULT_THEME_PATH = import_path.default.join(__dirname, "../../../theme-default");
 function getPkgThemeName(api) {
@@ -59,7 +59,7 @@ var theme_default = (api) => {
       api.registerPlugins([plugin]);
     }
   });
-  (0, import_exports.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", getPkgThemeName(api)].filter(Boolean).map((pkg) => new RegExp(pkg)));
   api.register({
     key: "modifyAppData",
     before: "appData",

package/dist/loaders/markdown/index.js

@@ -104,16 +104,14 @@ function mdLoader(content) {
     });
     return;
   }
-  deferrer[cacheKey] = new Promise((resolve) => {
-    (0, import_transformer.default)(content, {
-      ...import_plugin_utils.lodash.omit(opts, ["mode", "builtins", "onResolveDemos"]),
-      fileAbsPath: this.resourcePath
-    }).then((ret) => {
-      cache.setSync(cacheKey, ret);
-      resolve(ret);
-      cb(null, emit.call(this, opts, ret));
-    }, cb);
+  deferrer[cacheKey] = (0, import_transformer.default)(content, {
+    ...import_plugin_utils.lodash.omit(opts, ["mode", "builtins", "onResolveDemos"]),
+    fileAbsPath: this.resourcePath
   });
+  deferrer[cacheKey].then((ret) => {
+    cache.setSync(cacheKey, ret);
+    cb(null, emit.call(this, opts, ret));
+  }).catch(cb);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

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

@@ -133,7 +133,8 @@ function rehypeDemo(opts) {
               id: "",
               refAtomIds: [],
               fileAbsPath: "",
-              entryPointCode: codeType === "external" ? void 0 : codeValue
+              entryPointCode: codeType === "external" ? void 0 : codeValue,
+              resolver: opts.resolver
             };
             const previewerProps = {};
             let component = "";

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

@@ -39,7 +39,7 @@ function rehypeImg() {
       var _a;
       if (node.tagName === "img" && typeof ((_a = node.properties) == null ? void 0 : _a.src) === "string") {
         const src = node.properties.src.trim();
-        if (isRelativeUrl(src)) {
+        if (src && isRelativeUrl(src)) {
           delete node.properties.src;
           node.JSXAttributes = [
             {

package/dist/techStacks/react.js

@@ -54,6 +54,7 @@ var ReactTechStack = class {
     if (opts.type === "code-block") {
       const isTSX = opts.fileAbsPath.endsWith(".tsx");
       const { code } = (0, import_core.transformSync)(raw, {
+        filename: opts.fileAbsPath,
         jsc: {
           parser: {
             syntax: isTSX ? "typescript" : "ecmascript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.15",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",

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

@@ -4,7 +4,7 @@ import React from 'react';
 import "./index.less";
 
 var Hero = function Hero() {
-  var _links;
+  var _actions;
 
   var _useRouteMeta = useRouteMeta(),
       frontmatter = _useRouteMeta.frontmatter;
@@ -16,19 +16,19 @@ var Hero = function Hero() {
     dangerouslySetInnerHTML: {
       __html: frontmatter.hero.description
     }
-  }), Boolean((_links = frontmatter.hero.links) === null || _links === void 0 ? void 0 : _links.length) && /*#__PURE__*/React.createElement("div", {
-    className: "dumi-default-hero-links"
-  }, frontmatter.hero.links.map(function (_ref) {
-    var title = _ref.title,
+  }), Boolean((_actions = frontmatter.hero.actions) === null || _actions === void 0 ? void 0 : _actions.length) && /*#__PURE__*/React.createElement("div", {
+    className: "dumi-default-hero-actions"
+  }, frontmatter.hero.actions.map(function (_ref) {
+    var text = _ref.text,
         link = _ref.link;
     return /^(\w+:)\/\/|^(mailto|tel):/.test(link) ? /*#__PURE__*/React.createElement("a", {
       href: link,
       target: "_blank",
       rel: "noreferrer"
-    }, title) : /*#__PURE__*/React.createElement(Link, {
-      key: title,
+    }, text) : /*#__PURE__*/React.createElement(Link, {
+      key: text,
       to: link
-    }, title);
+    }, text);
   })));
 };
 

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

@@ -30,7 +30,7 @@
     line-height: 1.6;
   }
 
-  &-links {
+  &-actions {
     margin-top: 48px;
     display: flex;
     justify-content: center;