dumi 2.0.0-beta.12 → 2.0.0-beta.14

package/dist/constants.d.ts

@@ -1,4 +1,5 @@
-export declare const LOCAL_THEME_DIR = ".dumi/theme";
+export declare const LOCAL_DUMI_DIR = ".dumi";
+export declare const LOCAL_THEME_DIR: string;
 export declare const THEME_PREFIX = "dumi-theme-";
 export declare const SP_ROUTE_PREFIX = "~";
 export declare const PICKED_PKG_FIELDS: {

package/dist/constants.js

@@ -19,13 +19,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
+  LOCAL_DUMI_DIR: () => LOCAL_DUMI_DIR,
   LOCAL_THEME_DIR: () => LOCAL_THEME_DIR,
   PICKED_PKG_FIELDS: () => PICKED_PKG_FIELDS,
   SP_ROUTE_PREFIX: () => SP_ROUTE_PREFIX,
   THEME_PREFIX: () => THEME_PREFIX
 });
 module.exports = __toCommonJS(constants_exports);
-var LOCAL_THEME_DIR = ".dumi/theme";
+var LOCAL_DUMI_DIR = ".dumi";
+var LOCAL_THEME_DIR = `${LOCAL_DUMI_DIR}/theme`;
 var THEME_PREFIX = "dumi-theme-";
 var SP_ROUTE_PREFIX = "~";
 var PICKED_PKG_FIELDS = {
@@ -39,6 +41,7 @@ var PICKED_PKG_FIELDS = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  LOCAL_DUMI_DIR,
   LOCAL_THEME_DIR,
   PICKED_PKG_FIELDS,
   SP_ROUTE_PREFIX,

package/dist/features/derivative.d.ts

@@ -0,0 +1,6 @@
+import type { IApi } from "../types";
+/**
+ * plugin for derive default behaviors from umi
+ */
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/derivative.js

@@ -0,0 +1,59 @@
+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(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/derivative.ts
+var derivative_exports = {};
+__export(derivative_exports, {
+  default: () => derivative_default
+});
+module.exports = __toCommonJS(derivative_exports);
+var import_constants = require("../constants");
+var import_path = __toESM(require("path"));
+var import_plugin_utils = require("umi/plugin-utils");
+function getFilesByGlob(globExp, dir) {
+  return import_plugin_utils.glob.sync(globExp, { cwd: dir }).map((file) => (0, import_plugin_utils.winPath)(import_path.default.join(dir, file)));
+}
+var derivative_default = (api) => {
+  const dumiAbsDir = import_path.default.join(api.cwd, import_constants.LOCAL_DUMI_DIR);
+  const strategies = {
+    appJS: getFilesByGlob.bind(null, "app.{js,jsx,ts,tsx}", dumiAbsDir),
+    globalCSS: getFilesByGlob.bind(null, "global.{css,less,scss,sass}", dumiAbsDir),
+    globalJS: getFilesByGlob.bind(null, "global.{js,jsx,ts,tsx}", dumiAbsDir),
+    overridesCSS: getFilesByGlob.bind(null, "overrides.{css,less,scss,sass}", dumiAbsDir)
+  };
+  api.describe({ key: "dumi:derivative" });
+  api.modifyAppData((memo) => {
+    Object.entries(strategies).forEach(([key, fn]) => {
+      memo[key] = fn();
+    });
+    return memo;
+  });
+  api.onGenerateFiles(() => {
+    Object.entries(strategies).forEach(([key, fn]) => {
+      api.appData[key] = fn();
+    });
+  });
+  api.addRuntimePlugin(() => {
+    return strategies.appJS().slice(0, 1);
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/routes.js

@@ -44,6 +44,12 @@ function localizeUmiRoute(route, locales) {
     route.absPath = route.path !== "/" ? `/${route.path}` : route.path;
   }
 }
+function flatRoute(route) {
+  if (route.parentId !== "DocLayout") {
+    route.parentId = "DocLayout";
+    route.path = route.path === "*" ? route.path : route.absPath.slice(1);
+  }
+}
 var routes_default = (api) => {
   var _a, _b, _c;
   const extraWatchPaths = [
@@ -111,9 +117,9 @@ var routes_default = (api) => {
       };
     }
     Object.entries(pages).forEach(([, route]) => {
-      route.parentId = docLayoutId;
       route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(pagesDir, route.file));
-      route.path = route.absPath.slice(1);
+      flatRoute(route);
+      routes[route.id] = route;
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
       const base = import_path.default.join(api.cwd, dir);
@@ -123,8 +129,7 @@ var routes_default = (api) => {
       });
       Object.entries(dirRoutes).forEach(([key, route]) => {
         route.id = `${dir}/${key}`;
-        route.parentId = docLayoutId;
-        route.path = route.absPath.slice(1);
+        flatRoute(route);
         if (type) {
           const pluralType = (0, import_pluralize.plural)(type);
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");

package/dist/features/tabs.js

@@ -48,6 +48,7 @@ var tabs_default = (api) => {
     });
     tabsFromPlugins.forEach((tab) => {
       tab.id ?? (tab.id = `plugin-tab${tab.test ? `-${tab.test}` : ""}-${tab.key}`);
+      tab.component = (0, import_plugin_utils.winPath)(tab.component);
     });
     return memo;
   });

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

@@ -52,6 +52,7 @@ var transformer_default = async (raw, opts) => {
   const { default: remarkGfm } = await import("remark-gfm");
   const { default: remarkRehype } = await import("remark-rehype");
   const { default: rehypeAutolinkHeadings } = await import("rehype-autolink-headings");
+  const { default: rehypeRemoveComments } = await import("rehype-remove-comments");
   const resolver = import_enhanced_resolve.default.create.sync({
     extensions: [".js", ".jsx", ".ts", ".tsx"],
     alias: opts.alias
@@ -62,7 +63,7 @@ var transformer_default = async (raw, opts) => {
     processor,
     cwd: opts.cwd
   }));
-  processor.use(remarkRehype, { allowDangerousHtml: true }).use(import_rehypeRaw.default).use(import_rehypeStrip.default).use(import_rehypeImg.default).use(import_rehypeDemo.default, {
+  processor.use(remarkRehype, { allowDangerousHtml: true }).use(import_rehypeRaw.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,

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

@@ -49,7 +49,7 @@ function getCodeLang(node, opts) {
   var _a, _b, _c, _d;
   let lang = "";
   if (typeof ((_a = node.properties) == null ? void 0 : _a.src) === "string") {
-    node.properties.src = (0, import_plugin_utils.winPath)(opts.resolver(import_path.default.dirname(opts.fileAbsPath), node.properties.src));
+    node.properties.src = opts.resolver(import_path.default.dirname(opts.fileAbsPath), node.properties.src);
     lang = import_path.default.extname(node.properties.src).slice(1);
   } else if (Array.isArray((_b = node.properties) == null ? void 0 : _b.className) && (opts.codeBlockMode === "passive" ? / demo/.test(String((_c = node.data) == null ? void 0 : _c.meta)) : !/ pure/.test(String((_d = node.data) == null ? void 0 : _d.meta)))) {
     lang = String(node.properties.className[0]).replace("language-", "");

package/dist/preset.js

@@ -44,6 +44,7 @@ var preset_default = (api) => {
     plugins: [
       require.resolve("./registerMethods"),
       require.resolve("./features/configPlugins"),
+      require.resolve("./features/derivative"),
       require.resolve("./features/sideEffects"),
       require.resolve("./features/exports"),
       require.resolve("./features/compile"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.14",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",
@@ -87,6 +87,7 @@
     "react-helmet": "^6.1.0",
     "react-intl": "^6.1.1",
     "rehype-autolink-headings": "^6.1.1",
+    "rehype-remove-comments": "^5.0.0",
     "rehype-stringify": "^9.0.3",
     "remark-breaks": "^3.0.2",
     "remark-frontmatter": "^4.0.1",