dumi 2.4.33 → 2.4.34

package/dist/features/compile/index.js

@@ -116,7 +116,7 @@ var compile_default = (api) => {
   });
   api.onGenerateFiles({
     fn() {
-      var _a;
+      var _a, _b;
       if (api.config.utoopack) {
         api.writeTmpFile({
           noPluginDir: true,
@@ -126,7 +126,8 @@ var compile_default = (api) => {
             ((_a = api.service.themeData) == null ? void 0 : _a.builtins) ?? {},
             api.appData.routes ?? {},
             api.config.extraRemarkPlugins,
-            api.config.extraRehypePlugins
+            api.config.extraRehypePlugins,
+            ((_b = api.service.configManager) == null ? void 0 : _b.files) ?? []
           )
         });
       }

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>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins']): string;
+}>, routes?: Record<string, unknown>, extraRemarkPlugins?: IApi['config']['extraRemarkPlugins'], extraRehypePlugins?: IApi['config']['extraRehypePlugins'], sourceFiles?: string[]): string;
 export declare const getUtoopackRules: (api: IApi, config?: IApi['config']) => Record<string, unknown>;

package/dist/features/compile/utoopackLoaders.js

@@ -35,8 +35,10 @@ __export(utoopackLoaders_exports, {
   getUtoopackRules: () => getUtoopackRules
 });
 module.exports = __toCommonJS(utoopackLoaders_exports);
+var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
+var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
-var import_utils = require("./utils");
+var import_utils2 = require("./utils");
 var mdLoaderPath = require.resolve("../../loaders/markdown");
 var UTOOPACK_LOADER_CTX_KEY = "__dumiLoaderContextPath";
 var LOADER_CTX_FILENAME = "dumi-loader-ctx.cjs";
@@ -59,14 +61,64 @@ function findInRequireCache(target) {
   }
   return null;
 }
+function normalizeFnSource(fn) {
+  return Function.prototype.toString.call(fn).replace(/\s+/g, " ");
+}
+function isSameFunction(candidate, target) {
+  return typeof candidate === "function" && candidate.name === target.name && normalizeFnSource(candidate) === normalizeFnSource(target);
+}
+function findInModuleExports(target, mod) {
+  const exp = mod.exports;
+  if (!exp)
+    return null;
+  if (isSameFunction(exp, target)) {
+    return { modulePath: mod.filename, exportName: "module.exports" };
+  }
+  if (isSameFunction(exp == null ? void 0 : exp.default, target)) {
+    return { modulePath: mod.filename, exportName: "default" };
+  }
+  for (const [k, v] of Object.entries(exp)) {
+    if (isSameFunction(v, target)) {
+      return { modulePath: mod.filename, exportName: k };
+    }
+  }
+  return null;
+}
+function findInSourceFiles(target, sourceFiles) {
+  import_utils.register.register({ implementor: import_esbuild.default });
+  import_utils.register.clearFiles();
+  try {
+    for (const file of sourceFiles) {
+      try {
+        require(file);
+        const mod = require.cache[file];
+        if (!(mod == null ? void 0 : mod.exports))
+          continue;
+        const found = findInModuleExports(target, mod);
+        if (found)
+          return found;
+      } catch {
+      }
+    }
+    return null;
+  } finally {
+    for (const file of import_utils.register.getFiles()) {
+      delete require.cache[file];
+    }
+    for (const file of sourceFiles) {
+      delete require.cache[file];
+    }
+    import_utils.register.restore();
+  }
+}
 function toRequireRef(found) {
   const modRef = `require(${JSON.stringify(found.modulePath)})`;
   return found.exportName === "module.exports" ? modRef : `(${modRef})[${JSON.stringify(found.exportName)}]`;
 }
-function toPluginTargetRef(target) {
+function toPluginTargetRef(target, sourceFiles) {
   if (typeof target === "string")
     return JSON.stringify(target);
-  const found = findInRequireCache(target);
+  const found = findInRequireCache(target) ?? findInSourceFiles(target, sourceFiles);
   if (!found) {
     const name = target.name ? ` "${target.name}"` : "";
     throw new Error(
@@ -75,19 +127,20 @@ function toPluginTargetRef(target) {
   }
   return toRequireRef(found);
 }
-function toPluginRefs(plugins = []) {
+function toPluginRefs(plugins = [], sourceFiles = []) {
   return `[${plugins.map((plugin) => {
     if (Array.isArray(plugin)) {
       const [target, options] = plugin;
       const optionsRef = typeof options === "undefined" ? "undefined" : JSON.stringify(options);
       return `[${toPluginTargetRef(
-        target
+        target,
+        sourceFiles
       )}, ${optionsRef}]`;
     }
-    return toPluginTargetRef(plugin);
+    return toPluginTargetRef(plugin, sourceFiles);
   }).join(", ")}]`;
 }
-function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = []) {
+function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = [], sourceFiles = []) {
   const refs = [];
   for (const ts of techStacks) {
     const ctor = ts.constructor;
@@ -104,15 +157,24 @@ function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extra
     }
   }
   return `'use strict';
+try {
+  require('@umijs/utils').register.register({ implementor: require('@umijs/bundler-utils/compiled/esbuild') });
+} catch (_) {}
 exports.techStacks = [${refs.join(", ")}];
 exports.builtins = ${JSON.stringify(builtins)};
 exports.routes = ${JSON.stringify(routes)};
-exports.extraRemarkPlugins = ${toPluginRefs(extraRemarkPlugins)};
-exports.extraRehypePlugins = ${toPluginRefs(extraRehypePlugins)};
+exports.extraRemarkPlugins = ${toPluginRefs(
+    extraRemarkPlugins,
+    sourceFiles
+  )};
+exports.extraRehypePlugins = ${toPluginRefs(
+    extraRehypePlugins,
+    sourceFiles
+  )};
 `;
 }
 var getUtoopackRules = (api, config = api.config) => {
-  const disableLiveDemo = (0, import_utils.shouldDisabledLiveDemo)(api);
+  const disableLiveDemo = (0, import_utils2.shouldDisabledLiveDemo)(api);
   const loaderContextPath = import_path.default.join(
     api.paths.absTmpPath,
     LOADER_CTX_FILENAME

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.33",
+  "version": "2.4.34",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",