dumi 2.2.15 → 2.2.16

package/dist/constants.d.ts

@@ -17,3 +17,4 @@ export declare const PICKED_PKG_FIELDS: {
 export declare const USELESS_TMP_FILES: string[];
 export declare const VERSION_2_LEVEL_NAV = "^2.2.0";
 export declare const VERSION_2_DEPRECATE_SOFT_BREAKS = "^2.2.0";
+export declare const FS_CACHE_DIR = "node_modules/.cache/dumi";

package/dist/constants.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
+  FS_CACHE_DIR: () => FS_CACHE_DIR,
   LOCAL_DUMI_DIR: () => LOCAL_DUMI_DIR,
   LOCAL_PAGES_DIR: () => LOCAL_PAGES_DIR,
   LOCAL_THEME_DIR: () => LOCAL_THEME_DIR,
@@ -51,8 +52,10 @@ var PICKED_PKG_FIELDS = {
 var USELESS_TMP_FILES = ["tsconfig.json", "typings.d.ts"];
 var VERSION_2_LEVEL_NAV = "^2.2.0";
 var VERSION_2_DEPRECATE_SOFT_BREAKS = "^2.2.0";
+var FS_CACHE_DIR = "node_modules/.cache/dumi";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  FS_CACHE_DIR,
   LOCAL_DUMI_DIR,
   LOCAL_PAGES_DIR,
   LOCAL_THEME_DIR,

package/dist/features/compile/index.js

@@ -33,6 +33,8 @@ __export(compile_exports, {
 });
 module.exports = __toCommonJS(compile_exports);
 var import_react = __toESM(require("../../techStacks/react"));
+var import_utils = require("../../utils");
+var import_path = __toESM(require("path"));
 var import_assets = require("../assets");
 var compile_default = (api) => {
   api.describe({ key: "dumi:compile" });
@@ -41,14 +43,20 @@ var compile_default = (api) => {
     stage: Infinity,
     fn: () => new import_react.default()
   });
-  api.modifyConfig((memo) => {
-    if (memo.babelLoaderCustomize) {
-      api.logger.warn(
-        "Config `babelLoaderCustomize` will be override by dumi, please report issue if you need it."
-      );
+  api.modifyConfig({
+    stage: Infinity,
+    fn: (memo) => {
+      if (memo.babelLoaderCustomize) {
+        api.logger.warn(
+          "Config `babelLoaderCustomize` will be override by dumi, please report issue if you need it."
+        );
+      }
+      memo.babelLoaderCustomize = require.resolve("./babelLoaderCustomize");
+      const cacheDirPath = api.userConfig.cacheDirectoryPath || memo.cacheDirectoryPath;
+      if (cacheDirPath)
+        (0, import_utils._setFSCacheDir)(import_path.default.join(cacheDirPath, "dumi"));
+      return memo;
     }
-    memo.babelLoaderCustomize = require.resolve("./babelLoaderCustomize");
-    return memo;
   });
   api.chainWebpack(async (memo) => {
     const babelInUmi = memo.module.rule("src").use("babel-loader").entries();

package/dist/features/parser.js

@@ -43,9 +43,9 @@ function filterIgnoredProps(props) {
     } else if (prop.type === "object" && "properties" in prop) {
       prop.properties = filterIgnoredProps(prop.properties);
     } else if (prop.oneOf) {
-      prop.oneOf = prop.oneOf.map((item) => filterIgnoredProps({ _: item })._);
+      prop.oneOf = prop.oneOf.filter(Boolean).map((item) => filterIgnoredProps({ _: item })._);
     } else if (prop.allOf) {
-      prop.allOf = prop.allOf.map((item) => filterIgnoredProps({ _: item })._);
+      prop.allOf = prop.allOf.filter(Boolean).map((item) => filterIgnoredProps({ _: item })._);
     } else if ("hidden" in prop) {
       isHidden = true;
     }

package/dist/features/theme/index.js

@@ -72,11 +72,12 @@ function getPkgThemePath(api) {
     })
   );
 }
-function getModuleExports(modulePath) {
-  return (0, import_bundler_utils.parseModuleSync)({
+async function getModuleExports(modulePath) {
+  const [_, exports] = await (0, import_bundler_utils.parseModule)({
     path: modulePath,
     content: import_fs.default.readFileSync(modulePath, "utf-8")
-  })[1];
+  });
+  return exports || [];
 }
 function checkMinor2ByPkg(pkg) {
   var _a, _b, _c;
@@ -251,14 +252,14 @@ export default DumiLoading;
       });
     }
   });
-  api.onGenerateFiles(() => {
+  api.onGenerateFiles(async () => {
     var _a, _b, _c, _d, _e;
-    themeMapKeys.forEach((key) => {
-      Object.values(originalThemeData[key] || {}).forEach((item) => {
+    const pAll = themeMapKeys.flatMap(
+      (key) => Object.values(originalThemeData[key] || {}).map(async (item) => {
         if (item.source === "dumi")
           return;
-        let contents = [];
-        const exports = getModuleExports(item.source);
+        const exports = await getModuleExports(item.source);
+        const contents = [];
         if (exports.includes("default")) {
           contents.push(`export { default } from '${item.source}';`);
         }
@@ -270,10 +271,11 @@ export default DumiLoading;
           path: `dumi/theme/${key}/${item.specifier}.ts`,
           content: contents.join("\n")
         });
-      });
-    });
+      })
+    );
+    await Promise.all(pAll);
     const entryFile = api.config.resolve.entryFile && [import_path.default.resolve(api.cwd, api.config.resolve.entryFile)].find(import_fs.default.existsSync);
-    const entryExports = entryFile ? getModuleExports(entryFile) : [];
+    const entryExports = entryFile ? await getModuleExports(entryFile) : [];
     const hasDefaultExport = entryExports.includes("default");
     const hasNamedExport = entryExports.some((exp) => exp !== "default");
     api.writeTmpFile({

package/dist/utils.d.ts

@@ -21,10 +21,8 @@ export declare function parseCodeFrontmatter(raw: string): {
     code: string;
     frontmatter: Record<string, any> | null;
 };
-/**
- * get file-system cache for specific namespace
- */
 declare const caches: Record<string, ReturnType<typeof Cache>>;
+export declare function _setFSCacheDir(dir: string): void;
 export declare function getCache(ns: string): (typeof caches)['0'];
 /**
  * try to get father config

package/dist/utils.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  _setFSCacheDir: () => _setFSCacheDir,
   getCache: () => getCache,
   getContentHash: () => getContentHash,
   getFileContentByRegExp: () => getFileContentByRegExp,
@@ -45,6 +46,7 @@ var import_fs = __toESM(require("fs"));
 var import_js_yaml = __toESM(require("js-yaml"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
+var import_constants = require("./constants");
 function getFileIdFromFsPath(fsPath) {
   return import_plugin_utils.lodash.kebabCase((0, import_plugin_utils.winPath)(fsPath).replace(/((\/|^)index)?\.\w+$/g, ""));
 }
@@ -78,8 +80,11 @@ function parseCodeFrontmatter(raw) {
   }
   return { code: frontmatter ? code : raw, frontmatter };
 }
+var cacheDir = import_constants.FS_CACHE_DIR;
 var caches = {};
-var CACHE_PATH = "node_modules/.cache/dumi";
+function _setFSCacheDir(dir) {
+  cacheDir = dir;
+}
 function getCache(ns) {
   if (process.env.DUMI_CACHE === "none") {
     return { set() {
@@ -88,7 +93,7 @@ function getCache(ns) {
     }, getSync() {
     } };
   }
-  return caches[ns] ?? (caches[ns] = (0, import_file_system_cache.default)({ basePath: import_path.default.join(CACHE_PATH, ns) }));
+  return caches[ns] ?? (caches[ns] = (0, import_file_system_cache.default)({ basePath: import_path.default.resolve(cacheDir, ns) }));
 }
 async function tryFatherBuildConfigs(cwd) {
   let configs = [];
@@ -133,6 +138,7 @@ function getContentHash(content2, length = 8) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  _setFSCacheDir,
   getCache,
   getContentHash,
   getFileContentByRegExp,

package/package.json

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