dumi 2.4.40 → 2.4.42

package/dist/features/compile/index.js

@@ -118,6 +118,11 @@ var compile_default = (api) => {
     fn() {
       var _a, _b;
       if (api.config.utoopack) {
+        const demoAssetsFile = import_path.default.join(
+          api.paths.absTmpPath,
+          import_utoopackLoaders.UTOOPACK_DEMO_ASSETS_FILENAME
+        );
+        import_fs.default.rmSync(demoAssetsFile, { force: true });
         api.writeTmpFile({
           noPluginDir: true,
           path: import_utoopackLoaders.LOADER_CTX_FILENAME,
@@ -127,7 +132,8 @@ var compile_default = (api) => {
             api.appData.routes ?? {},
             api.config.extraRemarkPlugins,
             api.config.extraRehypePlugins,
-            ((_b = api.service.configManager) == null ? void 0 : _b.files) ?? []
+            ((_b = api.service.configManager) == null ? void 0 : _b.files) ?? [],
+            demoAssetsFile
           )
         });
       }

package/dist/features/compile/utoopackLoaders.d.ts

@@ -1,8 +1,9 @@
 import type { IApi, IDumiTechStack } from '../../types';
 export declare const UTOOPACK_LOADER_CTX_KEY = "__dumiLoaderContextPath";
 export declare const LOADER_CTX_FILENAME = "dumi-loader-ctx.cjs";
+export declare const UTOOPACK_DEMO_ASSETS_FILENAME = "dumi-utoopack-demo-assets.jsonl";
 export declare function buildLoaderContextContent(techStacks: IDumiTechStack[], builtins?: Record<string, {
     specifier: string;
     source: string;
-}>, routes?: Record<string, unknown>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins'], sourceFiles?: string[]): string;
+}>, routes?: Record<string, unknown>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins'], sourceFiles?: string[], demoAssetsFile?: string): string;
 export declare const getUtoopackRules: (api: IApi, config?: IApi['config']) => Record<string, unknown>;

package/dist/features/compile/utoopackLoaders.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utoopackLoaders_exports = {};
 __export(utoopackLoaders_exports, {
   LOADER_CTX_FILENAME: () => LOADER_CTX_FILENAME,
+  UTOOPACK_DEMO_ASSETS_FILENAME: () => UTOOPACK_DEMO_ASSETS_FILENAME,
   UTOOPACK_LOADER_CTX_KEY: () => UTOOPACK_LOADER_CTX_KEY,
   buildLoaderContextContent: () => buildLoaderContextContent,
   getUtoopackRules: () => getUtoopackRules
@@ -44,6 +45,7 @@ var utilsRegisterPath = require.resolve("@umijs/utils");
 var esbuildImplementorPath = require.resolve("@umijs/bundler-utils/compiled/esbuild");
 var UTOOPACK_LOADER_CTX_KEY = "__dumiLoaderContextPath";
 var LOADER_CTX_FILENAME = "dumi-loader-ctx.cjs";
+var UTOOPACK_DEMO_ASSETS_FILENAME = "dumi-utoopack-demo-assets.jsonl";
 function toSerializable(value) {
   return JSON.parse(JSON.stringify(value));
 }
@@ -169,7 +171,7 @@ function toPluginRefs(plugins = [], sourceFiles = []) {
     return toPluginTargetRef(plugin, sourceFiles);
   }).join(", ")}]`;
 }
-function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = [], sourceFiles = []) {
+function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = [], sourceFiles = [], demoAssetsFile) {
   const refs = toTechStackRefs(techStacks);
   return `'use strict';
 try {
@@ -184,6 +186,7 @@ try {
 exports.techStacks = [${refs.join(", ")}];
 exports.builtins = ${JSON.stringify(builtins)};
 exports.routes = ${JSON.stringify(routes)};
+exports.demoAssetsFile = ${JSON.stringify(demoAssetsFile)};
 exports.extraRemarkPlugins = ${toPluginRefs(
     extraRemarkPlugins,
     sourceFiles
@@ -363,6 +366,7 @@ var getUtoopackRules = (api, config = api.config) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LOADER_CTX_FILENAME,
+  UTOOPACK_DEMO_ASSETS_FILENAME,
   UTOOPACK_LOADER_CTX_KEY,
   buildLoaderContextContent,
   getUtoopackRules

package/dist/features/exportStatic.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/features/exportStatic.ts
@@ -23,12 +33,27 @@ __export(exportStatic_exports, {
 });
 module.exports = __toCommonJS(exportStatic_exports);
 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_assets = require("./assets");
+var import_utoopackLoaders = require("./compile/utoopackLoaders");
 var NO_PRERENDER_ROUTES = [
   // disable prerender for demo render page, because umi-hd doesn't support ssr
   // ref: https://github.com/umijs/dumi/pull/1451
   "demo-render"
 ];
+function readExampleAssetsFile(filePath) {
+  if (!import_fs.default.existsSync(filePath))
+    return [];
+  return import_fs.default.readFileSync(filePath, "utf-8").split("\n").filter(Boolean).reduce((acc, line) => {
+    try {
+      acc.push(JSON.parse(line));
+    } catch {
+    }
+    return acc;
+  }, []);
+}
 var exportStatic_default = (api) => {
   api.describe({
     key: "dumi:exportStatic",
@@ -50,7 +75,15 @@ var exportStatic_default = (api) => {
     before: "exportStatic",
     fn(memo) {
       const routePrefix = `${import_constants.SP_ROUTE_PREFIX}demos`;
-      const examples = (0, import_assets.getExampleAssets)();
+      const examples = import_plugin_utils.lodash.uniqBy(
+        [
+          ...(0, import_assets.getExampleAssets)(),
+          ...readExampleAssetsFile(
+            import_path.default.join(api.paths.absTmpPath, import_utoopackLoaders.UTOOPACK_DEMO_ASSETS_FILENAME)
+          )
+        ],
+        "id"
+      );
       api.appData.exportHtmlData.push(
         ...examples.map(({ id }) => ({
           route: { path: `/${routePrefix}/${id}` },

package/dist/loaders/markdown/index.d.ts

@@ -5,6 +5,7 @@ interface IMdLoaderDefaultModeOptions extends Omit<IMdTransformerOptions, 'fileA
     builtins: IThemeLoadResult['builtins'];
     onResolveDemos?: (demos: NonNullable<IMdTransformerResult['meta']['demos']>) => void;
     onResolveAtomMeta?: (atomId: string, meta: IMdTransformerResult['meta']['frontmatter']) => void;
+    demoAssetsFile?: string;
     disableLiveDemo: boolean;
 }
 interface IMdLoaderDemosModeOptions extends Omit<IMdLoaderDefaultModeOptions, 'builtins' | 'mode'> {
@@ -27,5 +28,6 @@ type MdLoaderCache = {
     getSync: (key: string, defaultValue: any) => any;
 };
 export declare function getMdLoaderCacheSync<T>(cache: MdLoaderCache, key: string, defaultValue: T): T;
+export declare function getDemoSourceFiles(demos?: IMdTransformerResult['meta']['demos']): string[];
 export default function mdLoader(this: any, content: string): void;
 export {};

package/dist/loaders/markdown/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var markdown_exports = {};
 __export(markdown_exports, {
   default: () => mdLoader,
+  getDemoSourceFiles: () => getDemoSourceFiles,
   getMdLoaderCacheSync: () => getMdLoaderCacheSync
 });
 module.exports = __toCommonJS(markdown_exports);
@@ -55,15 +56,24 @@ function getMdLoaderCacheSync(cache, key, defaultValue) {
     throw err;
   }
 }
+function getDemoSidecarFiles(file) {
+  const { dir, name } = import_path.default.parse(file);
+  const mdFile = import_path.default.join(dir, `${name}.md`);
+  return import_fs.default.existsSync(mdFile) ? [mdFile] : [];
+}
 function getDemoSourceFiles(demos = []) {
-  return demos.reduce((ret, demo) => {
+  const files = /* @__PURE__ */ new Set();
+  demos.forEach((demo) => {
     if ("resolveMap" in demo) {
-      ret.push(
-        ...Object.values(demo.resolveMap).filter((p) => import_path.default.isAbsolute(p))
-      );
+      Object.values(demo.resolveMap).filter((p) => import_path.default.isAbsolute(p)).forEach((file) => {
+        files.add(file);
+        getDemoSidecarFiles(file).forEach(
+          (sidecarFile) => files.add(sidecarFile)
+        );
+      });
     }
-    return ret;
-  }, []);
+  });
+  return Array.from(files);
 }
 function isRelativePath(path2) {
   return /^\.{1,2}(?!\w)/.test(path2);
@@ -86,6 +96,18 @@ function emitDefault(opts, ret) {
   if (demos && opts.onResolveDemos) {
     opts.onResolveDemos(demos);
   }
+  if (demos && opts.demoAssetsFile) {
+    const assets = demos.reduce((acc, demo) => {
+      if ("asset" in demo)
+        acc.push(JSON.stringify(demo.asset));
+      return acc;
+    }, []);
+    if (assets.length) {
+      import_fs.default.mkdirSync(import_path.default.dirname(opts.demoAssetsFile), { recursive: true });
+      import_fs.default.appendFileSync(opts.demoAssetsFile, `${assets.join("\n")}
+`);
+    }
+  }
   if (frontmatter.atomId && opts.onResolveAtomMeta) {
     opts.onResolveAtomMeta(frontmatter.atomId, frontmatter);
   }
@@ -371,9 +393,14 @@ function mdLoader(content) {
     if (ctx.extraRehypePlugins && !((_c = opts.extraRehypePlugins) == null ? void 0 : _c.length)) {
       opts.extraRehypePlugins = ctx.extraRehypePlugins;
     }
+    if (ctx.demoAssetsFile && !opts.demoAssetsFile) {
+      opts.demoAssetsFile = ctx.demoAssetsFile;
+    }
   }
   const cb = this.async();
-  if (process.env.NODE_ENV === "production" && ["onResolveDemos", "onResolveAtomMeta"].some((k) => k in opts)) {
+  if (process.env.NODE_ENV === "production" && ["onResolveDemos", "onResolveAtomMeta", "demoAssetsFile"].some(
+    (k) => k in opts
+  )) {
     this.cacheable(false);
   }
   const cache = (0, import_utils.getCache)("md-loader");
@@ -417,5 +444,6 @@ function mdLoader(content) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getDemoSourceFiles,
   getMdLoaderCacheSync
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.40",
+  "version": "2.4.42",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -69,9 +69,9 @@
     "@swc/core": "1.9.2",
     "@types/hast": "^2.3.5",
     "@types/mdast": "^3.0.12",
-    "@umijs/bundler-utils": "^4.6.72",
-    "@umijs/core": "^4.6.72",
-    "@umijs/utils": "^4.6.72",
+    "@umijs/bundler-utils": "^4.6.74",
+    "@umijs/core": "^4.6.74",
+    "@umijs/utils": "^4.6.74",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox-import-utils": "^2.2.3",
@@ -123,7 +123,7 @@
     "sass": "^1.64.1",
     "sitemap": "^7.1.1",
     "sucrase": "^3.34.0",
-    "umi": "^4.6.72",
+    "umi": "^4.6.74",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.2",
     "unist-util-visit-parents": "^5.1.3",
@@ -147,8 +147,8 @@
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.2.7",
     "@typescript/native-preview": "7.0.0-dev.20260623.1",
-    "@umijs/lint": "^4.6.72",
-    "@umijs/plugins": "4.6.72",
+    "@umijs/lint": "^4.6.74",
+    "@umijs/plugins": "4.6.74",
     "eslint": "^8.46.0",
     "esno": "^4.7.0",
     "fast-glob": "^3.3.1",