dumi 2.3.3 → 2.4.0-alpha.1

package/dist/features/compile/index.js

@@ -29,15 +29,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/features/compile/index.ts
 var compile_exports = {};
 __export(compile_exports, {
-  default: () => compile_default
+  default: () => compile_default,
+  techStacks: () => techStacks
 });
 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 import_makoHooks = require("./makoHooks");
+var techStacks = [];
 var compile_default = (api) => {
-  const techStacks = [];
   api.describe({ key: "dumi:compile" });
   api.register({
     key: "registerTechStack",
@@ -83,8 +85,14 @@ var compile_default = (api) => {
       return acc;
     }, [])
   );
+  api.modifyConfig((memo) => {
+    memo.mfsu = false;
+    return memo;
+  });
   api.chainWebpack(async (memo) => {
     const babelInUmi = memo.module.rule("src").use("babel-loader").entries();
+    if (!babelInUmi)
+      return memo;
     const loaderPath = require.resolve("../../loaders/markdown");
     memo.resolve.byDependency.set("commonjs", {
       conditionNames: ["require", "node", "import"]
@@ -101,6 +109,7 @@ var compile_default = (api) => {
       pkg: api.pkg
     };
     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,
@@ -142,4 +151,17 @@ var compile_default = (api) => {
     }
     return memo;
   });
+  api.modifyConfig((memo) => {
+    if (memo.mako) {
+      console.log(memo.mako);
+      memo.mako.hooks = {
+        load: (0, import_makoHooks.getLoadHook)(api)
+      };
+    }
+    return memo;
+  });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  techStacks
+});

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

@@ -0,0 +1,8 @@
+import type { IApi } from "../../types";
+export declare const getLoadHook: (api: IApi) => (filePath: string) => Promise<{
+    content: Buffer | null;
+    type: "css" | "js" | "jsx";
+} | {
+    content: string;
+    type: string;
+} | undefined>;

package/dist/features/compile/makoHooks.js

@@ -0,0 +1,155 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __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/compile/makoHooks.ts
+var makoHooks_exports = {};
+__export(makoHooks_exports, {
+  getLoadHook: () => getLoadHook
+});
+module.exports = __toCommonJS(makoHooks_exports);
+var import_fs = __toESM(require("fs"));
+var import_querystring = __toESM(require("querystring"));
+var import_url = __toESM(require("url"));
+var import__ = require(".");
+var import_utils = require("../../utils");
+var import_assets = require("../assets");
+var modeMap = {
+  "demo-index": "demo-index",
+  frontmatter: "frontmatter",
+  text: "text",
+  demo: "demo"
+};
+var customRunLoaders = async (options) => {
+  const result = await (0, import_utils.runLoaders)(options);
+  return {
+    content: result.result[0],
+    type: options.type ?? "jsx"
+  };
+};
+var mdLoaderPath = require.resolve("../../loaders/markdown");
+var getLoadHook = (api) => {
+  return async (filePath) => {
+    var _a, _b, _c, _d;
+    const loaderBaseOpts = {
+      techStacks: import__.techStacks,
+      cwd: api.cwd,
+      alias: api.config.alias,
+      resolve: api.config.resolve,
+      extraRemarkPlugins: api.config.extraRemarkPlugins,
+      extraRehypePlugins: api.config.extraRehypePlugins,
+      routes: api.appData.routes,
+      locales: api.config.locales || [],
+      pkg: api.pkg
+    };
+    const requestUrl = import_url.default.parse(filePath);
+    const query = import_querystring.default.parse(requestUrl.query);
+    if ((_a = requestUrl.query) == null ? void 0 : _a.includes("watch=parent")) {
+      return {
+        content: "",
+        type: "js"
+      };
+    }
+    if (/\..+$/.test(filePath)) {
+      if ((_b = requestUrl.query) == null ? void 0 : _b.includes("techStack")) {
+        return await customRunLoaders({
+          resource: filePath,
+          loaders: [
+            {
+              loader: require.resolve("../../loaders/demo"),
+              options: { techStacks: import__.techStacks, cwd: api.cwd }
+            }
+          ]
+        });
+      }
+    }
+    if (/\.(j|t)sx?\?type=frontmatter$/.test(filePath)) {
+      return await customRunLoaders({
+        resource: filePath,
+        loaders: [
+          {
+            loader: require.resolve("../../loaders/page"),
+            options: {}
+          }
+        ]
+      });
+    }
+    if ((_c = requestUrl.pathname) == null ? void 0 : _c.endsWith(".md")) {
+      let options;
+      const builtins = api.service.themeData.builtins;
+      const baseOptions = { ...loaderBaseOpts };
+      const resolveOptions = (queryType) => {
+        if (queryType in modeMap) {
+          return { ...baseOptions, mode: modeMap[queryType] };
+        }
+        const additionalOpts = api.isPluginEnable("assets") || api.isPluginEnable("exportStatic") ? {
+          builtins,
+          onResolveDemos(demos) {
+            const assets = demos.reduce(
+              (acc, demo) => "asset" in demo ? [...acc, demo.asset] : acc,
+              []
+            );
+            (0, import_assets.addExampleAssets)(assets);
+          },
+          onResolveAtomMeta: import_assets.addAtomMeta
+        } : { builtins };
+        return { ...baseOptions, ...additionalOpts };
+      };
+      options = resolveOptions(query.type);
+      return await customRunLoaders({
+        resource: filePath,
+        loaders: [
+          {
+            loader: mdLoaderPath,
+            options
+          }
+        ],
+        context: {},
+        readResource: import_fs.default.readFile.bind(import_fs.default)
+      });
+    }
+    if ((_d = requestUrl.query) == null ? void 0 : _d.includes("dumi-raw")) {
+      return await customRunLoaders({
+        resource: filePath,
+        loaders: [
+          {
+            loader: require.resolve("raw-loader"),
+            options: {}
+          },
+          {
+            loader: require.resolve("../../loaders/pre-raw"),
+            options: {}
+          }
+        ]
+      });
+    }
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLoadHook
+});

package/dist/features/html2sketch.js

@@ -38,8 +38,8 @@ var html2sketch_default = (api) => {
         path: "msgExecutor.ts",
         content: `import { getSketchJSON } from '.';
 
-window.addEventListener('message', (ev) => {
-  if (ev.data.type === 'dumi.html2sketch.exec') {
+    typeof window !== 'undefined' && window.addEventListener('message', (ev) => {
+          if (ev.data.type === 'dumi.html2sketch.exec') {
     const { value: opts, token } = ev.data;
 
     getSketchJSON(document, opts).then((value) => {

package/dist/features/theme/index.js

@@ -162,7 +162,7 @@ var theme_default = (api) => {
     return memo;
   });
   api.modifyConfig((memo) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (localThemeData) {
       themeMapKeys.forEach((key) => {
         Object.values(localThemeData[key] || {}).forEach((item) => {
@@ -215,22 +215,16 @@ var theme_default = (api) => {
         }
       }
     }
-    return memo;
-  });
-  api.chainWebpack((memo) => {
-    const lessRule = memo.module.rule("less");
-    ["css", "css-modules"].forEach((rule) => {
-      Object.values(lessRule.oneOf(rule).uses.entries()).forEach((loader) => {
-        if (loader.get("loader").includes("less-loader")) {
-          loader.tap((opts) => {
-            var _a;
-            (_a = opts.lessOptions).modifyVars ?? (_a.modifyVars = {});
-            opts.lessOptions.modifyVars["dark-selector"] = `~'[${import_constants.PREFERS_COLOR_ATTR}="dark"]'`;
-            return opts;
-          });
-        }
-      });
-    });
+    if (memo.theme) {
+      memo.theme["dark-selector"] = `~'[${import_constants.PREFERS_COLOR_ATTR}="dark"]'`;
+    } else if (memo.lessLoader) {
+      (_d = memo.lessLoader.lessOptions).modifyVars ?? (_d.modifyVars = {});
+      memo.lessLoader.lessOptions.modifyVars["dark-selector"] = `~'[${import_constants.PREFERS_COLOR_ATTR}="dark"]'`;
+    } else {
+      memo.theme = {
+        "dark-selector": `~'[${import_constants.PREFERS_COLOR_ATTR}="dark"]'`
+      };
+    }
     return memo;
   });
   api.onGenerateFiles({
@@ -392,6 +386,8 @@ export default DumiLoading;
   });
   api.addEntryCodeAhead(() => {
     const { prefersColor } = api.config.themeConfig;
+    if (typeof window === "undefined")
+      return "";
     if (prefersColor.switch === false && prefersColor.default !== "auto") {
       return `document.documentElement.setAttribute('${import_constants.PREFERS_COLOR_ATTR}', '${prefersColor.default}');`;
     }

package/dist/loaders/demo/index.js

@@ -22,14 +22,17 @@ __export(demo_exports, {
   default: () => demoLoader
 });
 module.exports = __toCommonJS(demo_exports);
+var import_utils = require("@umijs/utils");
 function demoLoader(raw) {
   const opts = this.getOptions();
   const techStackName = new URLSearchParams(this.resourceQuery).get(
     "techStack"
   );
   const techStack = opts.techStacks.find((t) => t.name === techStackName);
-  return techStack.transformCode(raw, {
+  let code = techStack.transformCode(raw, {
     type: "external",
     fileAbsPath: this.resourcePath
   });
+  code = code + `import '${(0, import_utils.winPath)(this.resourcePath)}?watch=parent';`;
+  return code;
 }

package/dist/loaders/markdown/index.js

@@ -59,7 +59,15 @@ function emitDefault(opts, ret) {
   if (frontmatter.atomId && opts.onResolveAtomMeta) {
     opts.onResolveAtomMeta(frontmatter.atomId, frontmatter);
   }
+  const dependencies = this.getDependencies().slice(1).filter((filePath) => {
+    return !filePath.includes("node_modules");
+  });
   return `${Object.values(opts.builtins).map((item) => `import ${item.specifier} from '${item.source}';`).join("\n")}
+${dependencies.filter((dep) => dep.endsWith(".md")).map(
+    (md) => `
+import '${(0, import_plugin_utils.winPath)(md)}?watch=parent';
+`
+  ).join("\n")}
 import LoadingComponent from '@@/dumi/theme/loading';
 import React, { Suspense } from 'react';
 import { DumiPage, useTabMeta, useRouteMeta } from 'dumi';
@@ -83,7 +91,7 @@ function emitDemo(opts, ret) {
   const { demos } = ret.meta;
   return import_plugin_utils.Mustache.render(
     `import React from 'react';
-
+     import '${(0, import_plugin_utils.winPath)(this.getDependencies()[0])}?watch=parent';
 export const demos = {
   {{#demos}}
   '{{{id}}}': {
@@ -107,7 +115,7 @@ export const demos = {
           var _a;
           if (((_a = asset.dependencies[file]) == null ? void 0 : _a.type) === "FILE") {
             asset = import_plugin_utils.lodash.cloneDeep(asset);
-            asset.dependencies[file].value = `{{{require('-!${resolveMap[file]}?dumi-raw').default}}}`;
+            asset.dependencies[file].value = `{{{require('${resolveMap[file]}?dumi-raw').default}}}`;
           }
         });
         return JSON.stringify(asset, null, 2).replace(/"{{{|}}}"/g, "");
@@ -166,7 +174,9 @@ export const demos = {
 function emitDemoIndex(opts, ret) {
   const { demos } = ret.meta;
   return import_plugin_utils.Mustache.render(
-    `export const demoIndex = {
+    `
+    import '${(0, import_plugin_utils.winPath)(this.getDependencies()[0])}?watch=parent';
+    export const demoIndex = {
   ids: {{{ids}}},
   getter: {{{getter}}}
 };`,
@@ -183,7 +193,9 @@ function emitDemoIndex(opts, ret) {
 function emitFrontmatter(opts, ret) {
   const { frontmatter, toc } = ret.meta;
   return import_plugin_utils.Mustache.render(
-    `export const toc = {{{toc}}};
+    `
+    import '${(0, import_plugin_utils.winPath)(this.getDependencies()[0])}?watch=parent';
+    export const toc = {{{toc}}};
 export const frontmatter = {{{frontmatter}}};`,
     {
       toc: JSON.stringify(toc),
@@ -193,9 +205,15 @@ export const frontmatter = {{{frontmatter}}};`,
 }
 function emitText(opts, ret) {
   const { texts } = ret.meta;
-  return import_plugin_utils.Mustache.render(`export const texts = {{{texts}}};`, {
-    texts: JSON.stringify(texts)
-  });
+  return import_plugin_utils.Mustache.render(
+    `
+  import '${(0, import_plugin_utils.winPath)(this.getDependencies()[0])}?watch=parent';
+  export const texts = {{{texts}}};
+  `,
+    {
+      texts: JSON.stringify(texts)
+    }
+  );
 }
 function emit(opts, ret) {
   const { demos, embeds } = ret.meta;

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

@@ -0,0 +1,2 @@
+export default function loader(): string;
+export declare function pitch(): string;

package/dist/loaders/null/index.js

@@ -0,0 +1,35 @@
+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/loaders/null/index.ts
+var null_exports = {};
+__export(null_exports, {
+  default: () => loader,
+  pitch: () => pitch
+});
+module.exports = __toCommonJS(null_exports);
+function loader() {
+  return "";
+}
+function pitch() {
+  return "";
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pitch
+});

package/dist/utils.d.ts

@@ -1,5 +1,9 @@
+/// <reference types="node" />
 import type { Range, RangeOptions } from '@umijs/utils/compiled/semver';
 import Cache from 'file-system-cache';
+import type { RunLoaderOption as InternalRunLoaderOption, RunLoaderResult } from '../compiled/loader-runner';
+export type * from '../compiled/loader-runner';
+export { getContext } from '../compiled/loader-runner';
 /**
  * get route path from file-system path
  */
@@ -48,8 +52,11 @@ export declare function generateMetaChunkName(path: string, cwd: string, locales
  * generate hash for string
  */
 export declare function getContentHash(content: string, length?: number): string;
+export type RunLoaderOption = Partial<InternalRunLoaderOption>;
+export declare function runLoaders(options: RunLoaderOption): Promise<RunLoaderResult>;
+export declare function runLoaders(options: RunLoaderOption, callback: undefined): Promise<RunLoaderResult>;
+export declare function runLoaders(options: RunLoaderOption, callback: (err: NodeJS.ErrnoException | null, result: RunLoaderResult) => any): void;
 /**
  * check if version is in range
  */
 export declare function isVersionInRange(version: string, range: string | Range, options?: RangeOptions): boolean;
-export {};

package/dist/utils.js

@@ -34,12 +34,14 @@ __export(utils_exports, {
   generateMetaChunkName: () => generateMetaChunkName,
   getCache: () => getCache,
   getContentHash: () => getContentHash,
+  getContext: () => import_loader_runner2.getContext,
   getFileContentByRegExp: () => getFileContentByRegExp,
   getFileIdFromFsPath: () => getFileIdFromFsPath,
   getFileRangeLines: () => getFileRangeLines,
   getProjectRoot: () => getProjectRoot,
   isVersionInRange: () => isVersionInRange,
   parseCodeFrontmatter: () => parseCodeFrontmatter,
+  runLoaders: () => runLoaders,
   tryFatherBuildConfigs: () => tryFatherBuildConfigs
 });
 module.exports = __toCommonJS(utils_exports);
@@ -49,7 +51,10 @@ 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_util = require("util");
+var import_loader_runner = require("../compiled/loader-runner");
 var import_constants = require("./constants");
+var import_loader_runner2 = require("../compiled/loader-runner");
 function getFileIdFromFsPath(fsPath) {
   return import_plugin_utils.lodash.kebabCase((0, import_plugin_utils.winPath)(fsPath).replace(/((\/|^)index)?\.\w+$/g, ""));
 }
@@ -160,6 +165,13 @@ function generateMetaChunkName(path2, cwd, locales = []) {
 function getContentHash(content2, length = 8) {
   return (0, import_crypto.createHash)("md5").update(content2).digest("hex").slice(0, length);
 }
+var promisifyRunLoaders = (0, import_util.promisify)(import_loader_runner.runLoaders);
+function runLoaders(options, callback) {
+  if (callback !== void 0) {
+    return (0, import_loader_runner.runLoaders)(options, callback);
+  }
+  return promisifyRunLoaders(options);
+}
 function isVersionInRange(version, range, options = { includePrerelease: true }) {
   if (import_plugin_utils.semver.valid(version)) {
     return import_plugin_utils.semver.satisfies(version, range, options);
@@ -176,11 +188,13 @@ function isVersionInRange(version, range, options = { includePrerelease: true })
   generateMetaChunkName,
   getCache,
   getContentHash,
+  getContext,
   getFileContentByRegExp,
   getFileIdFromFsPath,
   getFileRangeLines,
   getProjectRoot,
   isVersionInRange,
   parseCodeFrontmatter,
+  runLoaders,
   tryFatherBuildConfigs
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.3.3",
+  "version": "2.4.0-alpha.1",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -65,9 +65,9 @@
     "@swc/core": "1.4.2",
     "@types/hast": "^2.3.5",
     "@types/mdast": "^3.0.12",
-    "@umijs/bundler-utils": "^4.0.84",
-    "@umijs/core": "^4.0.84",
-    "@umijs/utils": "^4.0.84",
+    "@umijs/bundler-utils": "4.2.6-alpha.4",
+    "@umijs/core": "4.2.6-alpha.4",
+    "@umijs/utils": "4.2.6-alpha.4",
     "animated-scroll-to": "^2.3.0",
     "classnames": "2.3.2",
     "codesandbox": "^2.2.3",
@@ -119,7 +119,7 @@
     "sass": "^1.64.1",
     "sitemap": "^7.1.1",
     "sucrase": "^3.34.0",
-    "umi": "^4.0.84",
+    "umi": "4.2.6-alpha.4",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.2",
     "unist-util-visit-parents": "^5.1.3",
@@ -142,7 +142,7 @@
     "@types/react": "^18.2.17",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.2.7",
-    "@umijs/lint": "^4.0.84",
+    "@umijs/lint": "4.2.6-alpha.4",
     "@umijs/plugins": "4.0.32",
     "codesandbox-import-utils": "^2.2.3",
     "eslint": "^8.46.0",

package/theme-default/slots/Content/index.d.ts

@@ -1,5 +1,5 @@
 import { type FC, type ReactNode } from 'react';
-import './heti.scss';
+import '../../styles/heti.less';
 import './index.less';
 declare const Content: FC<{
     children: ReactNode;

package/theme-default/slots/Content/index.js

@@ -1,6 +1,6 @@
 import { useRouteMeta, useSidebarData, useSiteData } from 'dumi';
 import React from 'react';
-import "./heti.scss";
+import "../../styles/heti.less";
 import "./index.less";
 var Content = function Content(props) {
   var sidebar = useSidebarData();