dumi 2.4.1 → 2.4.3

package/dist/features/compile/index.js

@@ -108,8 +108,8 @@ var compile_default = (api) => {
       locales: api.config.locales,
       pkg: api.pkg
     };
+    memo.module.rule("watch-parent").pre().resourceQuery(/watch=parent/).use("null-loader").loader(require.resolve("../../loaders/null")).end();
     const mdRule = memo.module.rule("dumi-md").type("javascript/auto").test(/\.md$/);
-    mdRule.oneOf("md-null").pre().resourceQuery(/watch=parent/).use("null-loader").loader(require.resolve("../../loaders/null")).end();
     ["frontmatter", "text", "demo-index"].forEach((type) => {
       mdRule.oneOf(`md-${type}`).resourceQuery(new RegExp(`${type}$`)).use(`md-${type}-loader`).loader(loaderPath).options({
         ...loaderBaseOpts,

package/dist/loaders/markdown/index.js

@@ -114,8 +114,12 @@ export const demos = {
         Object.keys(this.resolveMap).forEach((file) => {
           var _a;
           if (((_a = asset.dependencies[file]) == null ? void 0 : _a.type) === "FILE") {
+            let assetValue = `{{{require('-!${resolveMap[file]}?dumi-raw').default}}}`;
+            if (process.env.OKAM) {
+              assetValue = `{{{require('${resolveMap[file]}?dumi-raw').default}}}`;
+            }
             asset = import_plugin_utils.lodash.cloneDeep(asset);
-            asset.dependencies[file].value = `{{{require('${resolveMap[file]}?dumi-raw').default}}}`;
+            asset.dependencies[file].value = assetValue;
           }
         });
         return JSON.stringify(asset, null, 2).replace(/"{{{|}}}"/g, "");

package/dist/templates/meta/exports.ts.tpl

@@ -147,41 +147,29 @@ export function getRouteMetaById<T extends { syncOnly?: boolean }>(
       toc,
       texts: [],
     };
-    if (filesMeta[id]) {
-      const { frontmatter, toc, textGetter, tabs } = filesMeta[id];
-      routeMeta.frontmatter = frontmatter;
-      routeMeta.toc = toc;
 
-      if (opts?.syncOnly) {
+    if (opts?.syncOnly) {
+      if (tabs) {
+        routeMeta.tabs = tabs.map((tabId) =>
+          genTab(tabId, getRouteMetaById(tabId, opts)),
+        );
+      }
+      return routeMeta;
+    } else {
+      return new Promise(async (resolve) => {
+        if (textGetter) {
+          ({ texts: routeMeta.texts } = await textGetter());
+        }
         if (tabs) {
-          routeMeta.tabs = tabs.map((tabId) =>
-            genTab(tabId, getRouteMetaById(tabId, opts)),
+          routeMeta.tabs = await Promise.all(
+            tabs.map(async (tabId) =>
+              genTab(tabId, await getRouteMetaById(tabId, opts)),
+            ),
           );
         }
-
-        return routeMeta;
-      } else {
-        return new Promise(async (resolve) => {
-          if (textGetter) {
-            ({ texts: routeMeta.texts } = await textGetter());
-          }
-
-          if (tabs) {
-            routeMeta.tabs = await Promise.all(
-              tabs.map(async (tabId) =>
-                genTab(tabId, await getRouteMetaById(tabId, opts)),
-              ),
-            );
-          }
-
-          resolve(routeMeta);
-        });
-      }
-    }
-    if (opts?.syncOnly) {
-      return routeMeta;
+        resolve(routeMeta);
+      });
     }
-    return Promise.resolve(routeMeta);
   }
 }
 

package/package.json

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