dumi 2.4.8 → 2.4.10

package/dist/features/compile/index.js

@@ -39,6 +39,7 @@ var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_assets = require("../assets");
 var import_makoHooks = require("./makoHooks");
+var import_utils2 = require("./utils");
 var techStacks = [];
 var compile_default = (api) => {
   api.describe({ key: "dumi:compile" });
@@ -113,7 +114,8 @@ var compile_default = (api) => {
       extraRehypePlugins: api.config.extraRehypePlugins,
       routes: api.appData.routes,
       locales: api.config.locales,
-      pkg: api.pkg
+      pkg: api.pkg,
+      disableLiveDemo: (0, import_utils2.shouldDisabledLiveDemo)(api)
     };
     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$/);

package/dist/features/compile/makoHooks.js

@@ -38,6 +38,7 @@ var import_url = __toESM(require("url"));
 var import__ = require(".");
 var import_utils = require("../../utils");
 var import_assets = require("../assets");
+var import_utils2 = require("./utils");
 var modeMap = {
   "demo-index": "demo-index",
   frontmatter: "frontmatter",
@@ -53,6 +54,7 @@ var customRunLoaders = async (options) => {
 };
 var mdLoaderPath = require.resolve("../../loaders/markdown");
 var getLoadHook = (api) => {
+  const disableLiveDemo = (0, import_utils2.shouldDisabledLiveDemo)(api);
   return async (filePath) => {
     var _a, _b, _c, _d;
     const loaderBaseOpts = {
@@ -64,7 +66,8 @@ var getLoadHook = (api) => {
       extraRehypePlugins: api.config.extraRehypePlugins,
       routes: api.appData.routes,
       locales: api.config.locales || [],
-      pkg: api.pkg
+      pkg: api.pkg,
+      disableLiveDemo
     };
     const requestUrl = import_url.default.parse(filePath);
     const query = import_querystring.default.parse(requestUrl.query);

package/dist/features/compile/utils.d.ts

@@ -0,0 +1,2 @@
+import { IApi } from 'umi';
+export declare const shouldDisabledLiveDemo: (api: IApi) => boolean;

package/dist/features/compile/utils.js

@@ -0,0 +1,42 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/compile/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  shouldDisabledLiveDemo: () => shouldDisabledLiveDemo
+});
+module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@umijs/utils");
+var import_lodash = require("@umijs/utils/compiled/lodash");
+var shouldDisabledLiveDemo = (api) => {
+  const extraBabelPlugins = api.userConfig.extraBabelPlugins;
+  const disableFlag = (0, import_lodash.isArray)(extraBabelPlugins) && extraBabelPlugins.some(
+    (p) => /^import$|babel-plugin-import/.test(p[0])
+  );
+  if (disableFlag) {
+    import_utils.logger.warn(
+      "live demo feature has been automatically disabled since babel-plugin-import be registered, if you want to enable live demo feature, checkout: https://d.umijs.org/guide/faq"
+    );
+  }
+  return disableFlag;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  shouldDisabledLiveDemo
+});

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

@@ -5,6 +5,7 @@ interface IMdLoaderDefaultModeOptions extends Omit<IMdTransformerOptions, 'fileA
     builtins: IThemeLoadResult['builtins'];
     onResolveDemos?: (demos: NonNullable<IMdTransformerResult['meta']['demos']>) => void;
     onResolveAtomMeta?: (atomId: string, meta: IMdTransformerResult['meta']['frontmatter']) => void;
+    disableLiveDemo: boolean;
 }
 interface IMdLoaderDemosModeOptions extends Omit<IMdLoaderDefaultModeOptions, 'builtins' | 'mode'> {
     mode: 'meta';

package/dist/loaders/markdown/index.js

@@ -50,7 +50,7 @@ function getDemoSourceFiles(demos = []) {
   }, []);
 }
 function isRelativePath(path2) {
-  return path2.startsWith("./") || path2.startsWith("../");
+  return /^\.{1,2}(?!\w)/.test(path2);
 }
 function emitDefault(opts, ret) {
   const { frontmatter, demos } = ret.meta;
@@ -101,20 +101,19 @@ function emitDemo(opts, ret) {
       demoDepsMap[_a = demo.id] ?? (demoDepsMap[_a] = {});
       Object.keys(demo.resolveMap).forEach((key, index) => {
         const specifier = `${demo.id.replace(/-/g, "_")}_deps_${index}`;
-        if (key !== entryFileName && !isRelativePath(key)) {
-          if (shareDepsMap[key]) {
-            demoDepsMap[demo.id][key] = shareDepsMap[key];
+        if (key !== entryFileName) {
+          const normalizedKey = isRelativePath(key) ? (0, import_plugin_utils.winPath)(demo.resolveMap[key]) : key;
+          if (!shareDepsMap[normalizedKey]) {
+            demoDepsMap[demo.id][normalizedKey] = specifier;
+            shareDepsMap[normalizedKey] = specifier;
           } else {
-            demoDepsMap[demo.id][key] = specifier;
-            shareDepsMap[key] = specifier;
+            demoDepsMap[demo.id][normalizedKey] = shareDepsMap[normalizedKey];
           }
-        } else if (isRelativePath(key)) {
-          demoDepsMap[demo.id][(0, import_plugin_utils.winPath)(demo.resolveMap[key])] = specifier;
         }
       });
     }
   });
-  const dedupedDemosDeps = Object.entries(demoDepsMap).reduce((acc, [, deps]) => {
+  const dedupedDemosDeps = opts.disableLiveDemo ? [] : Object.entries(demoDepsMap).reduce((acc, [, deps]) => {
     return acc.concat(
       Object.entries(deps).map(([key, specifier]) => {
         const existingIndex = acc.findIndex((obj) => obj.key === key);
@@ -165,7 +164,7 @@ export const demos = {
         return JSON.stringify(asset, null, 2).replace(/"{{{|}}}"/g, "");
       },
       renderContext: function renderContext() {
-        if (!("resolveMap" in this) || !("asset" in this))
+        if (!("resolveMap" in this) || !("asset" in this) || opts.disableLiveDemo)
           return "undefined";
         const context = Object.entries(demoDepsMap[this.id]).reduce(
           (acc, [key, specifier]) => ({
@@ -177,7 +176,7 @@ export const demos = {
         return JSON.stringify(context, null, 2).replace(/"{{{|}}}"/g, "");
       },
       renderRenderOpts: function renderRenderOpts() {
-        if (!("renderOpts" in this)) {
+        if (!("renderOpts" in this) || opts.disableLiveDemo) {
           return "undefined";
         }
         const renderOpts = this.renderOpts;

package/package.json

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