dumi 2.4.37 → 2.4.38-beta.1

package/dist/features/compile/utoopackLoaders.js

@@ -40,6 +40,8 @@ var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
 var import_utils2 = require("./utils");
 var mdLoaderPath = require.resolve("../../loaders/markdown");
+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";
 function toSerializable(value) {
@@ -115,6 +117,33 @@ function toRequireRef(found) {
   const modRef = `require(${JSON.stringify(found.modulePath)})`;
   return found.exportName === "module.exports" ? modRef : `(${modRef})[${JSON.stringify(found.exportName)}]`;
 }
+function toTechStackRefs(techStacks) {
+  const refs = [];
+  for (const ts of techStacks) {
+    const ctor = ts.constructor;
+    let ref;
+    if (ctor !== Object) {
+      const found = findInRequireCache(ctor);
+      if (found) {
+        ref = `new (${toRequireRef(found)})()`;
+      }
+    } else {
+      const found = findInRequireCache(ts);
+      if (found) {
+        ref = toRequireRef(found);
+      }
+    }
+    if (ref) {
+      refs.push(ref);
+    } else {
+      const name = ts.constructor.name ? ` (${ts.constructor.name})` : "";
+      console.warn(
+        `[dumi] Utoopack markdown loader cannot serialize tech stack "${ts.name}"${name}. Please export the tech stack class from a module.`
+      );
+    }
+  }
+  return refs;
+}
 function toPluginTargetRef(target, sourceFiles) {
   if (typeof target === "string")
     return JSON.stringify(target);
@@ -141,25 +170,17 @@ function toPluginRefs(plugins = [], sourceFiles = []) {
   }).join(", ")}]`;
 }
 function buildLoaderContextContent(techStacks, builtins = {}, routes = {}, extraRemarkPlugins = [], extraRehypePlugins = [], sourceFiles = []) {
-  const refs = [];
-  for (const ts of techStacks) {
-    const ctor = ts.constructor;
-    if (ctor !== Object) {
-      const found = findInRequireCache(ctor);
-      if (found) {
-        refs.push(`new (${toRequireRef(found)})()`);
-      }
-    } else {
-      const found = findInRequireCache(ts);
-      if (found) {
-        refs.push(toRequireRef(found));
-      }
-    }
-  }
+  const refs = toTechStackRefs(techStacks);
   return `'use strict';
 try {
-  require('@umijs/utils').register.register({ implementor: require('@umijs/bundler-utils/compiled/esbuild') });
-} catch (_) {}
+  require(${JSON.stringify(
+    utilsRegisterPath
+  )}).register.register({ implementor: require(${JSON.stringify(
+    esbuildImplementorPath
+  )}) });
+} catch (e) {
+  console.warn('[dumi] failed to register TS require hook for utoopack loader context:', e);
+}
 exports.techStacks = [${refs.join(", ")}];
 exports.builtins = ${JSON.stringify(builtins)};
 exports.routes = ${JSON.stringify(routes)};

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

@@ -23,5 +23,9 @@ interface IMdLoaderTextModeOptions extends Omit<IMdLoaderDefaultModeOptions, 'bu
     mode: 'text';
 }
 export type IMdLoaderOptions = IMdLoaderDefaultModeOptions | IMdLoaderDemosModeOptions | IMdLoaderDemoModeOptions | IMdLoaderFrontmatterModeOptions | IMdLoaderTextModeOptions | IMdLoaderDemoIndexModeOptions;
+type MdLoaderCache = {
+    getSync: (key: string, defaultValue: any) => any;
+};
+export declare function getMdLoaderCacheSync<T>(cache: MdLoaderCache, key: string, defaultValue: T): T;
 export default function mdLoader(this: any, content: string): void;
 export {};

package/dist/loaders/markdown/index.js

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/loaders/markdown/index.ts
 var markdown_exports = {};
 __export(markdown_exports, {
-  default: () => mdLoader
+  default: () => mdLoader,
+  getMdLoaderCacheSync: () => getMdLoaderCacheSync
 });
 module.exports = __toCommonJS(markdown_exports);
 var import_utoopackLoaders = require("../../features/compile/utoopackLoaders");
@@ -40,6 +41,20 @@ var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_transformer = __toESM(require("./transformer"));
 var import_rehypeText = require("./transformer/rehypeText");
+function isMalformedCacheError(err) {
+  return err instanceof SyntaxError || err instanceof Error && /Unexpected end of JSON input|Unterminated string in JSON/.test(
+    err.message
+  );
+}
+function getMdLoaderCacheSync(cache, key, defaultValue) {
+  try {
+    return cache.getSync(key, defaultValue);
+  } catch (err) {
+    if (isMalformedCacheError(err))
+      return defaultValue;
+    throw err;
+  }
+}
 function getDemoSourceFiles(demos = []) {
   return demos.reduce((ret, demo) => {
     if ("resolveMap" in demo) {
@@ -372,7 +387,7 @@ function mdLoader(content) {
     baseCacheKey,
     getDepsCacheKey(depsMapping[this.resourcePath])
   ].join(":");
-  const cacheRet = cache.getSync(cacheKey, "");
+  const cacheRet = getMdLoaderCacheSync(cache, cacheKey, "");
   if (cacheRet) {
     cb(null, emit.call(this, opts, cacheRet));
     return;
@@ -400,3 +415,7 @@ function mdLoader(content) {
     delete deferrer[cacheKey];
   }).catch(cb);
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getMdLoaderCacheSync
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.37",
+  "version": "2.4.38-beta.1",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",