Merge branch 'master' into template-vue

umijs · Sep 29, 2024 · c27842c · c27842c
2 parents df60338 + f926808
commit c27842c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.4.11",
+  "version": "2.4.12",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/loaders/markdown/index.ts b/src/loaders/markdown/index.ts
@@ -144,15 +144,18 @@ function emitDemo(
   const { demos } = ret.meta;
   const shareDepsMap: Record<string, string> = {};
   const demoDepsMap: Record<string, Record<string, string>> = {};
+  const relativeDepsMap: Record<string, Record<string, string>> = {};
 
   demos?.forEach((demo) => {
     if ('resolveMap' in demo && 'asset' in demo) {
       const entryFileName = Object.keys(demo.asset.dependencies)[0];
       demoDepsMap[demo.id] ??= {};
+      relativeDepsMap[demo.id] ??= {};
       Object.keys(demo.resolveMap).forEach((key, index) => {
         const specifier = `${demo.id.replace(/[^\w\d]/g, '_')}_deps_${index}`;
         if (key !== entryFileName) {
-          const normalizedKey = isRelativePath(key)
+          const isRelative = isRelativePath(key);
+          const normalizedKey = isRelative
             ? winPath(demo.resolveMap[key])
             : key;
 
@@ -162,6 +165,12 @@ function emitDemo(
           } else {
             demoDepsMap[demo.id][normalizedKey] = shareDepsMap[normalizedKey];
           }
+
+          if (isRelative) {
+            relativeDepsMap[demo.id][key] = `{{{${
+              shareDepsMap[normalizedKey] || specifier
+            }}}}`;
+          }
         }
       });
     }
@@ -244,7 +253,7 @@ export const demos = {
             ...acc,
             ...{ [key]: `{{{${specifier}}}}` },
           }),
-          {},
+          relativeDepsMap[this.id],
         );
         return JSON.stringify(context, null, 2).replace(/"{{{|}}}"/g, '');
       },

diff --git a/suites/preset-vue/package.json b/suites/preset-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dumijs/preset-vue",
-  "version": "2.3.0",
+  "version": "2.4.12",
   "description": "Vue support plugins for dumi",
   "keywords": [
     "dumi",