dumi 2.4.31 → 2.4.33

package/dist/features/compile/index.js

@@ -124,7 +124,9 @@ var compile_default = (api) => {
           content: (0, import_utoopackLoaders.buildLoaderContextContent)(
             techStacks,
             ((_a = api.service.themeData) == null ? void 0 : _a.builtins) ?? {},
-            api.appData.routes ?? {}
+            api.appData.routes ?? {},
+            api.config.extraRemarkPlugins,
+            api.config.extraRehypePlugins
           )
         });
       }

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

@@ -4,5 +4,5 @@ export declare const LOADER_CTX_FILENAME = "dumi-loader-ctx.cjs";
 export declare function buildLoaderContextContent(techStacks: IDumiTechStack[], builtins?: Record<string, {
     specifier: string;
     source: string;
-}>, routes?: Record<string, unknown>): string;
+}>, routes?: Record<string, unknown>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins']): string;
 export declare const getUtoopackRules: (api: IApi, config?: IApi['config']) => Record<string, unknown>;

package/dist/features/compile/utoopackLoaders.js

@@ -59,23 +59,47 @@ function findInRequireCache(target) {
   }
   return null;
 }
-function buildLoaderContextContent(techStacks, builtins = {}, routes = {}) {
+function toRequireRef(found) {
+  const modRef = `require(${JSON.stringify(found.modulePath)})`;
+  return found.exportName === "module.exports" ? modRef : `(${modRef})[${JSON.stringify(found.exportName)}]`;
+}
+function toPluginTargetRef(target) {
+  if (typeof target === "string")
+    return JSON.stringify(target);
+  const found = findInRequireCache(target);
+  if (!found) {
+    const name = target.name ? ` "${target.name}"` : "";
+    throw new Error(
+      `Utoopack markdown loader requires extra unified plugin function${name} to be exported from a module.`
+    );
+  }
+  return toRequireRef(found);
+}
+function toPluginRefs(plugins = []) {
+  return `[${plugins.map((plugin) => {
+    if (Array.isArray(plugin)) {
+      const [target, options] = plugin;
+      const optionsRef = typeof options === "undefined" ? "undefined" : JSON.stringify(options);
+      return `[${toPluginTargetRef(
+        target
+      )}, ${optionsRef}]`;
+    }
+    return toPluginTargetRef(plugin);
+  }).join(", ")}]`;
+}
+function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = []) {
   const refs = [];
   for (const ts of techStacks) {
     const ctor = ts.constructor;
     if (ctor !== Object) {
       const found = findInRequireCache(ctor);
       if (found) {
-        const modRef = `require(${JSON.stringify(found.modulePath)})`;
-        const ctorRef = found.exportName === "module.exports" ? modRef : `(${modRef})[${JSON.stringify(found.exportName)}]`;
-        refs.push(`new (${ctorRef})()`);
+        refs.push(`new (${toRequireRef(found)})()`);
       }
     } else {
       const found = findInRequireCache(ts);
       if (found) {
-        const modRef = `require(${JSON.stringify(found.modulePath)})`;
-        const ref = found.exportName === "module.exports" ? modRef : `(${modRef})[${JSON.stringify(found.exportName)}]`;
-        refs.push(ref);
+        refs.push(toRequireRef(found));
       }
     }
   }
@@ -83,6 +107,8 @@ function buildLoaderContextContent(techStacks, builtins = {}, routes = {}) {
 exports.techStacks = [${refs.join(", ")}];
 exports.builtins = ${JSON.stringify(builtins)};
 exports.routes = ${JSON.stringify(routes)};
+exports.extraRemarkPlugins = ${toPluginRefs(extraRemarkPlugins)};
+exports.extraRehypePlugins = ${toPluginRefs(extraRehypePlugins)};
 `;
 }
 var getUtoopackRules = (api, config = api.config) => {

package/dist/loaders/markdown/index.js

@@ -317,7 +317,7 @@ function getDepsCacheKey(deps = []) {
 var deferrer = {};
 var depsMapping = {};
 function mdLoader(content) {
-  var _a;
+  var _a, _b, _c;
   let opts = this.getOptions();
   const loaderContextPath = opts[import_utoopackLoaders.UTOOPACK_LOADER_CTX_KEY];
   if (loaderContextPath) {
@@ -331,6 +331,12 @@ function mdLoader(content) {
     if (ctx.routes && !Object.keys(opts.routes ?? {}).length) {
       opts.routes = ctx.routes;
     }
+    if (ctx.extraRemarkPlugins && !((_b = opts.extraRemarkPlugins) == null ? void 0 : _b.length)) {
+      opts.extraRemarkPlugins = ctx.extraRemarkPlugins;
+    }
+    if (ctx.extraRehypePlugins && !((_c = opts.extraRehypePlugins) == null ? void 0 : _c.length)) {
+      opts.extraRehypePlugins = ctx.extraRehypePlugins;
+    }
   }
   const cb = this.async();
   if (process.env.NODE_ENV === "production" && ["onResolveDemos", "onResolveAtomMeta"].some((k) => k in opts)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.31",
+  "version": "2.4.33",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -11,7 +11,8 @@
     "jamstack",
     "markdown",
     "components",
-    "documentation"
+    "documentation",
+    "utoopack"
   ],
   "homepage": "https://d.umijs.org",
   "bugs": {
@@ -68,9 +69,9 @@
     "@swc/core": "1.9.2",
     "@types/hast": "^2.3.5",
     "@types/mdast": "^3.0.12",
-    "@umijs/bundler-utils": "^4.6.65",
-    "@umijs/core": "^4.6.65",
-    "@umijs/utils": "^4.6.65",
+    "@umijs/bundler-utils": "^4.6.66",
+    "@umijs/core": "^4.6.66",
+    "@umijs/utils": "^4.6.66",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox-import-utils": "^2.2.3",
@@ -122,7 +123,7 @@
     "sass": "^1.64.1",
     "sitemap": "^7.1.1",
     "sucrase": "^3.34.0",
-    "umi": "^4.6.65",
+    "umi": "^4.6.66",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.2",
     "unist-util-visit-parents": "^5.1.3",
@@ -146,8 +147,8 @@
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.2.7",
     "@typescript/native-preview": "7.0.0-dev.20260609.1",
-    "@umijs/lint": "^4.6.65",
-    "@umijs/plugins": "4.6.65",
+    "@umijs/lint": "^4.6.66",
+    "@umijs/plugins": "4.6.66",
     "eslint": "^8.46.0",
     "esno": "^4.7.0",
     "fast-glob": "^3.3.1",