dumi 2.2.1-alpha.0 → 2.2.2

package/dist/features/theme/index.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/features/theme/index.ts
@@ -27,7 +34,9 @@ __export(theme_exports, {
 module.exports = __toCommonJS(theme_exports);
 var import_constants = require("../../constants");
 var import_bundler_utils = require("@umijs/bundler-utils");
+var import_child_process = require("child_process");
 var import_fs = __toESM(require("fs"));
+var import_hosted_git_info = __toESM(require("hosted-git-info"));
 var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_derivative = require("../derivative");
@@ -35,19 +44,33 @@ var import_loader = __toESM(require("./loader"));
 var DEFAULT_THEME_PATH = import_path.default.join(__dirname, "../../../theme-default");
 function getPkgThemeName(api) {
   if (process.env.DUMI_THEME) {
-    const themePkg = require(import_path.default.join(process.env.DUMI_THEME, "package.json"));
-    return themePkg.name;
+    const envThemePkgPath = require.resolve(
+      import_path.default.join(process.env.DUMI_THEME, "package.json"),
+      { paths: [api.cwd] }
+    );
+    return require(envThemePkgPath).name;
   }
-  const validDeps = Object.assign({}, api.pkg.dependencies, api.pkg.devDependencies);
-  const pkgThemeName = Object.keys(validDeps).find((pkg) => pkg.split("/").pop().startsWith(import_constants.THEME_PREFIX));
+  const validDeps = Object.assign(
+    {},
+    api.pkg.dependencies,
+    api.pkg.devDependencies
+  );
+  const pkgThemeName = Object.keys(validDeps).find(
+    (pkg) => pkg.split("/").pop().startsWith(import_constants.THEME_PREFIX)
+  );
   return pkgThemeName;
 }
 function getPkgThemePath(api) {
   const pkgThemeName = getPkgThemeName(api);
-  return process.env.DUMI_THEME || pkgThemeName && import_path.default.dirname(import_plugin_utils.resolve.sync(`${process.env.DUMI_THEME || pkgThemeName}/package.json`, {
-    basedir: api.cwd,
-    preserveSymlinks: true
-  }));
+  if (process.env.DUMI_THEME) {
+    return import_path.default.resolve(api.cwd, process.env.DUMI_THEME);
+  }
+  return pkgThemeName && import_path.default.dirname(
+    import_plugin_utils.resolve.sync(`${pkgThemeName}/package.json`, {
+      basedir: api.cwd,
+      preserveSymlinks: true
+    })
+  );
 }
 function getModuleExports(modulePath) {
   return (0, import_bundler_utils.parseModuleSync)({
@@ -65,7 +88,10 @@ function checkMinor2ByPkg(pkg) {
 var theme_default = (api) => {
   const defaultThemeData = (0, import_loader.default)(DEFAULT_THEME_PATH);
   const pkgThemePath = getPkgThemePath(api);
-  const pkgThemeData = (0, import_plugin_utils.deepmerge)(defaultThemeData, pkgThemePath ? (0, import_loader.default)(import_path.default.join(pkgThemePath, "dist")) : {});
+  const pkgThemeData = (0, import_plugin_utils.deepmerge)(
+    defaultThemeData,
+    pkgThemePath ? (0, import_loader.default)(import_path.default.join(pkgThemePath, "dist")) : {}
+  );
   const localThemePath = import_path.default.join(api.cwd, import_constants.LOCAL_THEME_DIR);
   const localThemeData = import_fs.default.existsSync(localThemePath) ? (0, import_loader.default)(localThemePath) : void 0;
   const themeMapKeys = [
@@ -80,13 +106,18 @@ var theme_default = (api) => {
       api.registerPlugins([plugin]);
     }
   });
-  (0, import_derivative.safeExcludeInMFSU)(api, [
-    "dumi/theme-default",
-    "@ant-design/icons-svg",
-    getPkgThemeName(api)
-  ].filter(Boolean).map((pkg) => new RegExp(pkg)));
+  (0, import_derivative.safeExcludeInMFSU)(
+    api,
+    [
+      "dumi/theme-default",
+      // for svgr
+      "@ant-design/icons-svg",
+      getPkgThemeName(api)
+    ].filter(Boolean).map((pkg) => new RegExp(pkg))
+  );
   api.register({
     key: "modifyAppData",
+    // prepare themeData before umi appData, for generate layout routes
     before: "appData",
     async fn(memo) {
       originalThemeData = await api.applyPlugins({
@@ -119,11 +150,14 @@ var theme_default = (api) => {
   api.modifyAppData((memo) => {
     memo._2LevelNavAvailable = checkMinor2ByPkg(api.pkg);
     if (pkgThemePath && !memo._2LevelNavAvailable) {
-      memo._2LevelNavAvailable = checkMinor2ByPkg(require(import_path.default.join(pkgThemePath, "package.json")));
+      memo._2LevelNavAvailable = checkMinor2ByPkg(
+        require(import_path.default.join(pkgThemePath, "package.json"))
+      );
     }
     return memo;
   });
   api.modifyConfig((memo) => {
+    var _a, _b;
     if (localThemeData) {
       themeMapKeys.forEach((key) => {
         Object.values(localThemeData[key] || {}).forEach((item) => {
@@ -132,10 +166,34 @@ var theme_default = (api) => {
       });
     }
     memo.alias["dumi/theme"] = "dumi/theme-original";
-    memo.alias["dumi/theme-original"] = import_path.default.join(api.paths.absTmpPath, "dumi/theme");
+    memo.alias["dumi/theme-original"] = import_path.default.join(
+      api.paths.absTmpPath,
+      "dumi/theme"
+    );
     memo.alias["dumi/theme-default"] = DEFAULT_THEME_PATH;
     memo.extraBabelIncludes ?? (memo.extraBabelIncludes = []);
-    memo.extraBabelIncludes.push(import_path.default.resolve(__dirname, "../../client/theme-api"));
+    memo.extraBabelIncludes.push(
+      import_path.default.resolve(__dirname, "../../client/theme-api")
+    );
+    const repoUrl = ((_a = api.pkg.repository) == null ? void 0 : _a.url) || api.pkg.repository;
+    if (((_b = memo.themeConfig) == null ? void 0 : _b.editLink) !== false && typeof repoUrl === "string") {
+      const hostedGitIns = import_hosted_git_info.default.fromUrl(repoUrl);
+      let branch = "";
+      try {
+        branch = (0, import_child_process.execSync)("git branch --show-current", {
+          stdio: "pipe"
+        }).toString().trim();
+      } catch {
+        branch = "master";
+      }
+      if (hostedGitIns) {
+        memo.themeConfig ?? (memo.themeConfig = {});
+        memo.themeConfig.editLink = `${hostedGitIns.edit(
+          `${api.pkg.repository.directory || ""}/{filename}`,
+          { committish: branch }
+        )}`;
+      }
+    }
     return memo;
   });
   api.chainWebpack((memo) => {
@@ -154,6 +212,45 @@ var theme_default = (api) => {
     });
     return memo;
   });
+  api.onGenerateFiles({
+    // execute before umi tmpFiles plugin
+    stage: -Infinity,
+    fn() {
+      const { globalLoading } = api.appData;
+      const enableNProgress = !!api.config.themeConfig.nprogress;
+      api.appData.globalLoading = "@@/dumi/theme/loading";
+      api.writeTmpFile({
+        noPluginDir: true,
+        path: "dumi/theme/loading.tsx",
+        content: `${enableNProgress ? `import nprogress from '${(0, import_plugin_utils.winPath)(
+          import_path.default.dirname(require.resolve("nprogress/package"))
+        )}';
+import './nprogress.css';` : ""}${globalLoading ? `
+import UserLoading from '${globalLoading}';` : ""}
+import React, { useLayoutEffect, type FC } from 'react';
+import { useSiteData } from 'dumi';
+
+const DumiLoading: FC = () => {
+  const { setLoading } = useSiteData();
+
+  useLayoutEffect(() => {
+    setLoading(true);${enableNProgress ? `
+    nprogress.start();` : ""}
+
+    return () => {
+      setLoading(false);${enableNProgress ? `
+      nprogress.done();` : ""}
+    }
+  }, []);
+
+  return ${globalLoading ? "<UserLoading />" : "null"};
+}
+
+export default DumiLoading;
+`
+      });
+    }
+  });
   api.onGenerateFiles(() => {
     var _a, _b, _c, _d, _e;
     themeMapKeys.forEach((key) => {
@@ -179,17 +276,14 @@ var theme_default = (api) => {
     const entryExports = entryFile ? getModuleExports(entryFile) : [];
     const hasDefaultExport = entryExports.includes("default");
     const hasNamedExport = entryExports.some((exp) => exp !== "default");
-    const enableNProgress = !!api.config.themeConfig.nprogress;
     api.writeTmpFile({
       noPluginDir: true,
       path: "dumi/theme/ContextWrapper.tsx",
       content: `import React, { useState, useEffect, useRef } from 'react';
 import { useOutlet, history } from 'dumi';
-${enableNProgress ? `
-import nprogress from '${(0, import_plugin_utils.winPath)(import_path.default.dirname(require.resolve("nprogress/package")))}';
-import './nprogress.css';
-` : ""}
-import { SiteContext } from '${(0, import_plugin_utils.winPath)(require.resolve("../../client/theme-api/context"))}';
+import { SiteContext } from '${(0, import_plugin_utils.winPath)(
+        require.resolve("../../client/theme-api/context")
+      )}';
 import { demos, components } from '../meta';
 import { locales } from '../locales/config';${hasDefaultExport ? `
 import entryDefaultExport from '${(0, import_plugin_utils.winPath)(entryFile)}';` : ""}${hasNamedExport ? `
@@ -210,12 +304,6 @@ export default function DumiContextWrapper() {
       if (next.location.pathname !== prev.current) {
         prev.current = next.location.pathname;
 
-        // mark loading when route change, page component will set false when loaded
-        setLoading(true);
-
-        // start nprogress
-        ${enableNProgress ? `nprogress.start();` : ""}
-
         // scroll to top when route changed
         document.documentElement.scrollTo(0, 0);
       }
@@ -224,7 +312,9 @@ export default function DumiContextWrapper() {
 
   return (
     <SiteContext.Provider value={{
-      pkg: ${JSON.stringify(import_plugin_utils.lodash.pick(api.pkg, ...Object.keys(import_constants.PICKED_PKG_FIELDS)))},
+      pkg: ${JSON.stringify(
+        import_plugin_utils.lodash.pick(api.pkg, ...Object.keys(import_constants.PICKED_PKG_FIELDS))
+      )},
       historyType: "${((_a = api.config.history) == null ? void 0 : _a.type) || "browser"}",
       entryExports,
       demos,
@@ -233,7 +323,12 @@ export default function DumiContextWrapper() {
       loading,
       setLoading,
       hostname: ${JSON.stringify((_b = api.config.sitemap) == null ? void 0 : _b.hostname)},
-      themeConfig: ${JSON.stringify(Object.assign(import_plugin_utils.lodash.pick(api.config, "logo", "description", "title"), api.config.themeConfig))},
+      themeConfig: ${JSON.stringify(
+        Object.assign(
+          import_plugin_utils.lodash.pick(api.config, "logo", "description", "title"),
+          api.config.themeConfig
+        )
+      )},
       _2_level_nav_available: ${api.appData._2LevelNavAvailable},
     }}>
       {outlet}
@@ -326,16 +421,34 @@ export default function DumiContextWrapper() {
   );
 })();`;
   });
-  if (require("@umijs/core/package").__npminstall_done && import_fs.default.existsSync(localThemePath) && import_fs.default.lstatSync(localThemePath).isSymbolicLink()) {
+  api.addEntryImportsAhead(() => [
+    {
+      specifier: "{ getPluginManager as getDumiPluginManager }",
+      source: "./core/plugin"
+    },
+    {
+      specifier: "{ setPluginManager as setDumiPluginManager }",
+      source: (0, import_plugin_utils.winPath)(require.resolve("../../client/theme-api/utils"))
+    }
+  ]);
+  api.addEntryCode(() => "setDumiPluginManager(getDumiPluginManager());");
+  api.addRuntimePluginKey(() => [
+    "modifyCodeSandboxData",
+    "modifyStackBlitzData"
+  ]);
+  if (
+    /*isTnpm*/
+    require("@umijs/core/package").__npminstall_done && import_fs.default.existsSync(localThemePath) && import_fs.default.lstatSync(localThemePath).isSymbolicLink()
+  ) {
     api.chainWebpack((memo) => {
       const devThemeNodeModules = import_path.default.join(api.cwd, "../node_modules");
-      memo.snapshot((0, import_plugin_utils.deepmerge)(memo.get("snapshot"), {
-        immutablePaths: [devThemeNodeModules],
-        managedPaths: [devThemeNodeModules]
-      }));
+      memo.snapshot(
+        (0, import_plugin_utils.deepmerge)(memo.get("snapshot"), {
+          immutablePaths: [devThemeNodeModules],
+          managedPaths: [devThemeNodeModules]
+        })
+      );
       return memo;
     });
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/features/theme/loader.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/features/theme/loader.ts
@@ -29,7 +36,9 @@ var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 function getComponentMapFromDir(globExp, dir) {
   return import_plugin_utils.glob.sync(globExp, { cwd: dir }).reduce((ret, file) => {
-    const specifier = import_path.default.basename((0, import_plugin_utils.winPath)(file).replace(/(\/index)?\.[a-z]+$/, ""));
+    const specifier = import_path.default.basename(
+      (0, import_plugin_utils.winPath)(file).replace(/(\/index)?\.[a-z]+$/, "")
+    );
     if (/^[A-Z\d]/.test(specifier)) {
       ret[specifier] = {
         specifier,
@@ -54,11 +63,18 @@ var loader_default = (dir) => {
     name: import_path.default.basename(dir),
     path: dir,
     locales: getLocaleMapFromDir("locales/*.json", dir),
-    builtins: getComponentMapFromDir("builtins/{!(*.d),*/index}.{js,jsx,ts,tsx}", dir),
-    slots: getComponentMapFromDir("slots/{!(*.d),*/index}.{js,jsx,ts,tsx}", dir),
-    layouts: getComponentMapFromDir("layouts/{GlobalLayout,DocLayout,DemoLayout}{.,/index.}{js,jsx,ts,tsx}", dir),
+    builtins: getComponentMapFromDir(
+      "builtins/{!(*.d),*/index}.{js,jsx,ts,tsx}",
+      dir
+    ),
+    slots: getComponentMapFromDir(
+      "slots/{!(*.d),*/index}.{js,jsx,ts,tsx}",
+      dir
+    ),
+    layouts: getComponentMapFromDir(
+      "layouts/{GlobalLayout,DocLayout,DemoLayout}{.,/index.}{js,jsx,ts,tsx}",
+      dir
+    ),
     ...plugin ? { plugin: import_path.default.join(dir, plugin) } : {}
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/index.js

@@ -17,7 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -36,5 +43,6 @@ var defineConfig = (config) => config;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,
-  unistUtilVisit
+  unistUtilVisit,
+  ...require("umi")
 });

package/dist/loaders/demo/index.js

@@ -24,12 +24,12 @@ __export(demo_exports, {
 module.exports = __toCommonJS(demo_exports);
 function demoLoader(raw) {
   const opts = this.getOptions();
-  const techStackName = new URLSearchParams(this.resourceQuery).get("techStack");
+  const techStackName = new URLSearchParams(this.resourceQuery).get(
+    "techStack"
+  );
   const techStack = opts.techStacks.find((t) => t.name === techStackName);
   return techStack.transformCode(raw, {
     type: "external",
     fileAbsPath: this.resourcePath
   });
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

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

@@ -9,6 +9,6 @@ interface IMdLoaderDemosModeOptions extends Omit<IMdLoaderDefaultModeOptions, 'b
     onResolveDemos?: (demos: NonNullable<IMdTransformerResult['meta']['demos']>) => void;
     onResolveAtomMeta?: (atomId: string, meta: IMdTransformerResult['meta']['frontmatter']) => void;
 }
-export declare type IMdLoaderOptions = IMdLoaderDefaultModeOptions | IMdLoaderDemosModeOptions;
+export type IMdLoaderOptions = IMdLoaderDefaultModeOptions | IMdLoaderDemosModeOptions;
 export default function mdLoader(this: any, content: string): void;
 export {};

package/dist/loaders/markdown/index.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/loaders/markdown/index.ts
@@ -51,7 +58,8 @@ function emit(opts, ret) {
     if (frontmatter.atomId && opts.onResolveAtomMeta) {
       opts.onResolveAtomMeta(frontmatter.atomId, frontmatter);
     }
-    return import_plugin_utils.Mustache.render(`import React from 'react';
+    return import_plugin_utils.Mustache.render(
+      `import React from 'react';
 
 export const demos = {
   {{#demos}}
@@ -64,25 +72,27 @@ export const demos = {
 export const frontmatter = {{{frontmatter}}};
 export const toc = {{{toc}}};
 export const texts = {{{texts}}};
-`, {
-      demos,
-      frontmatter: JSON.stringify(frontmatter),
-      toc: JSON.stringify(toc),
-      texts: JSON.stringify(texts),
-      renderAsset: function renderAsset() {
-        if (!("asset" in this))
-          return "null";
-        let { asset } = this;
-        const { sources } = this;
-        Object.keys(this.sources).forEach((file) => {
-          if (!asset.dependencies[file])
-            return;
-          asset = import_plugin_utils.lodash.cloneDeep(asset);
-          asset.dependencies[file].value = `{{{require('-!${sources[file]}?dumi-raw').default}}}`;
-        });
-        return JSON.stringify(asset, null, 2).replace(/"{{{|}}}"/g, "");
+`,
+      {
+        demos,
+        frontmatter: JSON.stringify(frontmatter),
+        toc: JSON.stringify(toc),
+        texts: JSON.stringify(texts),
+        renderAsset: function renderAsset() {
+          if (!("asset" in this))
+            return "null";
+          let { asset } = this;
+          const { sources } = this;
+          Object.keys(this.sources).forEach((file) => {
+            if (!asset.dependencies[file])
+              return;
+            asset = import_plugin_utils.lodash.cloneDeep(asset);
+            asset.dependencies[file].value = `{{{require('-!${sources[file]}?dumi-raw').default}}}`;
+          });
+          return JSON.stringify(asset, null, 2).replace(/"{{{|}}}"/g, "");
+        }
       }
-    });
+    );
   } else {
     const isTabContent = (0, import_tabs.isTabRouteFile)(this.resourcePath);
     return `${Object.values(opts.builtins).map((item) => `import ${item.specifier} from '${item.source}';`).join("\n")}
@@ -100,7 +110,9 @@ export default DumiMarkdownContent;`;
   }
 }
 function getDepsCacheKey(deps = []) {
-  return JSON.stringify(deps.map((file) => `${file}:${import_fs.default.statSync(file).mtimeMs}`));
+  return JSON.stringify(
+    deps.map((file) => `${file}:${import_fs.default.statSync(file).mtimeMs}`)
+  );
 }
 var deferrer = {};
 var depsMapping = {};
@@ -132,7 +144,9 @@ function mdLoader(content) {
     fileAbsPath: (0, import_plugin_utils.winPath)(this.resourcePath)
   });
   deferrer[cacheKey].then((ret) => {
-    depsMapping[this.resourcePath] = ret.meta.embeds.concat(getDemoSourceFiles(ret.meta.demos));
+    depsMapping[this.resourcePath] = ret.meta.embeds.concat(
+      getDemoSourceFiles(ret.meta.demos)
+    );
     const finalCacheKey = [
       baseCacheKey,
       getDepsCacheKey(depsMapping[this.resourcePath])
@@ -142,5 +156,3 @@ function mdLoader(content) {
     delete deferrer[cacheKey];
   }).catch(cb);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

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

@@ -1,6 +1,6 @@
 import type { IParsedBlockAsset } from "../../../assetParsers/block";
-import type { IRouteMeta } from "../../../client/theme-api/types";
-import type { IDumiConfig, IDumiTechStack } from "../../../types";
+import type { ILocalesConfig, IRouteMeta } from "../../../client/theme-api/types";
+import type { IApi, IDumiConfig, IDumiTechStack } from "../../../types";
 import type { IRoute } from 'umi';
 import type { Data } from 'vfile';
 declare module 'hast' {
@@ -42,6 +42,8 @@ export interface IMdTransformerOptions {
     extraRemarkPlugins?: IDumiConfig['extraRemarkPlugins'];
     extraRehypePlugins?: IDumiConfig['extraRehypePlugins'];
     routes: Record<string, IRoute>;
+    locales: ILocalesConfig;
+    pkg: IApi['pkg'];
 }
 export interface IMdTransformerResult {
     content: string;

package/dist/loaders/markdown/transformer/index.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/loaders/markdown/transformer/index.ts
@@ -25,7 +32,9 @@ __export(transformer_exports, {
   default: () => transformer_default
 });
 module.exports = __toCommonJS(transformer_exports);
+var import_constants = require("../../../constants");
 var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
+var import_plugin_utils = require("umi/plugin-utils");
 var import_rehypeDemo = __toESM(require("./rehypeDemo"));
 var import_rehypeDesc = __toESM(require("./rehypeDesc"));
 var import_rehypeEnhancedTag = __toESM(require("./rehypeEnhancedTag"));
@@ -38,9 +47,17 @@ var import_rehypeRaw = __toESM(require("./rehypeRaw"));
 var import_rehypeSlug = __toESM(require("./rehypeSlug"));
 var import_rehypeStrip = __toESM(require("./rehypeStrip"));
 var import_rehypeText = __toESM(require("./rehypeText"));
+var import_remarkBreaks = __toESM(require("./remarkBreaks"));
 var import_remarkContainer = __toESM(require("./remarkContainer"));
 var import_remarkEmbed = __toESM(require("./remarkEmbed"));
 var import_remarkMeta = __toESM(require("./remarkMeta"));
+function keepSoftBreak(pkg) {
+  var _a, _b, _c;
+  if (((_a = pkg == null ? void 0 : pkg.name) == null ? void 0 : _a.startsWith("@examples/")) || (pkg == null ? void 0 : pkg.name) === "dumi")
+    return false;
+  const ver = ((_b = pkg == null ? void 0 : pkg.devDependencies) == null ? void 0 : _b.dumi) ?? ((_c = pkg == null ? void 0 : pkg.dependencies) == null ? void 0 : _c.dumi) ?? "^2.0.0";
+  return !import_plugin_utils.semver.subset(ver, import_constants.VERSION_2_DEPRECATE_SOFT_BREAKS);
+}
 function applyUnifiedPlugin(opts) {
   const [plugin, options] = Array.isArray(opts.plugin) ? opts.plugin : [opts.plugin];
   const mod = typeof plugin === "function" ? plugin : require(require.resolve(plugin, { paths: [opts.cwd] }));
@@ -48,12 +65,12 @@ function applyUnifiedPlugin(opts) {
   opts.processor.use(fn, options);
 }
 var transformer_default = async (raw, opts) => {
-  var _a, _b;
+  var _a, _b, _c;
+  let fileLocaleLessPath = opts.fileAbsPath;
   const { unified } = await import("unified");
   const { default: remarkParse } = await import("remark-parse");
   const { default: remarkFrontmatter } = await import("remark-frontmatter");
   const { default: remarkDirective } = await import("remark-directive");
-  const { default: remarkBreaks } = await import("remark-breaks");
   const { default: remarkGfm } = await import("remark-gfm");
   const { default: remarkRehype } = await import("remark-rehype");
   const { default: rehypeAutolinkHeadings } = await import("rehype-autolink-headings");
@@ -62,40 +79,52 @@ var transformer_default = async (raw, opts) => {
     extensions: [".js", ".jsx", ".ts", ".tsx"],
     alias: opts.alias
   });
+  const fileLocale = (_a = opts.locales.find(
+    (locale) => opts.fileAbsPath.endsWith(`.${locale.id}.md`)
+  )) == null ? void 0 : _a.id;
+  if (fileLocale) {
+    fileLocaleLessPath = opts.fileAbsPath.replace(`.${fileLocale}.md`, ".md");
+  }
   const processor = unified().use(remarkParse).use(import_remarkEmbed.default, { fileAbsPath: opts.fileAbsPath, alias: opts.alias }).use(remarkFrontmatter).use(import_remarkMeta.default, {
     cwd: opts.cwd,
     fileAbsPath: opts.fileAbsPath,
+    fileLocaleLessPath,
     resolve: opts.resolve
-  }).use(remarkDirective).use(import_remarkContainer.default).use(remarkBreaks).use(remarkGfm);
-  (_a = opts.extraRemarkPlugins) == null ? void 0 : _a.forEach((plugin) => applyUnifiedPlugin({
-    plugin,
-    processor,
-    cwd: opts.cwd
-  }));
+  }).use(remarkDirective).use(import_remarkContainer.default).use(remarkGfm);
+  if (keepSoftBreak(opts.pkg)) {
+    processor.use(import_remarkBreaks.default, { fileAbsPath: opts.fileAbsPath });
+  }
+  (_b = opts.extraRemarkPlugins) == null ? void 0 : _b.forEach(
+    (plugin) => applyUnifiedPlugin({
+      plugin,
+      processor,
+      cwd: opts.cwd
+    })
+  );
   processor.use(remarkRehype, { allowDangerousHtml: true }).use(import_rehypeRaw.default, {
     fileAbsPath: opts.fileAbsPath
-  }).use(import_rehypeHighlightLine.default, {
-    resolve: opts.resolve
-  }).use(rehypeRemoveComments, { removeConditional: true }).use(import_rehypeStrip.default).use(import_rehypeImg.default).use(import_rehypeDemo.default, {
+  }).use(import_rehypeHighlightLine.default).use(rehypeRemoveComments, { removeConditional: true }).use(import_rehypeStrip.default).use(import_rehypeImg.default).use(import_rehypeDemo.default, {
     techStacks: opts.techStacks,
     cwd: opts.cwd,
     fileAbsPath: opts.fileAbsPath,
+    fileLocaleLessPath,
+    fileLocale,
     resolve: opts.resolve,
     resolver
   }).use(import_rehypeSlug.default).use(import_rehypeLink.default, {
     fileAbsPath: opts.fileAbsPath,
     routes: opts.routes
   }).use(rehypeAutolinkHeadings).use(import_rehypeIsolation.default).use(import_rehypeEnhancedTag.default).use(import_rehypeDesc.default).use(import_rehypeText.default);
-  (_b = opts.extraRehypePlugins) == null ? void 0 : _b.forEach((plugin) => applyUnifiedPlugin({
-    plugin,
-    processor,
-    cwd: opts.cwd
-  }));
+  (_c = opts.extraRehypePlugins) == null ? void 0 : _c.forEach(
+    (plugin) => applyUnifiedPlugin({
+      plugin,
+      processor,
+      cwd: opts.cwd
+    })
+  );
   const result = await processor.use(import_rehypeJsxify.default).process(raw);
   return {
     content: String(result.value),
     meta: result.data
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/loaders/markdown/transformer/rehypeDemo.d.ts

@@ -5,8 +5,10 @@ import type { IMdTransformerOptions } from '.';
 export declare const DEMO_PROP_VALUE_KEY = "$demo-prop-value-key";
 export declare const DUMI_DEMO_TAG = "DumiDemo";
 export declare const DUMI_DEMO_GRID_TAG = "DumiDemoGrid";
-declare type IRehypeDemoOptions = Pick<IMdTransformerOptions, 'techStacks' | 'cwd' | 'fileAbsPath' | 'resolve'> & {
+type IRehypeDemoOptions = Pick<IMdTransformerOptions, 'techStacks' | 'cwd' | 'fileAbsPath' | 'resolve'> & {
     resolver: typeof sync;
+    fileLocaleLessPath: string;
+    fileLocale?: string;
 };
 export default function rehypeDemo(opts: IRehypeDemoOptions): Transformer<Root>;
 export {};