dumi 2.0.0-beta.6 → 2.0.0-beta.7

package/dist/client/theme-api/DumiDemo.js

@@ -11,6 +11,7 @@ export var DumiDemo = function DumiDemo(props) {
   var _demos$props$demo$id = demos[props.demo.id],
       component = _demos$props$demo$id.component,
       asset = _demos$props$demo$id.asset;
+  if (props.demo.inline) return /*#__PURE__*/createElement(component);
   return /*#__PURE__*/React.createElement(Previewer, _extends({
     asset: asset,
     demoUrl: // allow user override demoUrl by frontmatter

package/dist/client/theme-api/context.d.ts

@@ -1,7 +1,9 @@
+import type { PICKED_PKG_FIELDS } from "../../constants";
 import type { AtomComponentAsset } from 'dumi-assets-types';
 import { type ComponentType } from 'react';
 import type { ILocalesConfig, IPreviewerProps, IThemeConfig } from './types';
 interface ISiteContext {
+    pkg: Partial<Record<keyof typeof PICKED_PKG_FIELDS, any>>;
     demos: Record<string, {
         component: ComponentType;
         asset: IPreviewerProps['asset'];

package/dist/client/theme-api/context.js

@@ -1,5 +1,6 @@
 import { createContext, useContext } from 'react';
 export var SiteContext = /*#__PURE__*/createContext({
+  pkg: {},
   demos: {},
   components: {},
   locales: [],

package/dist/constants.d.ts

@@ -1,3 +1,12 @@
 export declare const LOCAL_THEME_DIR = ".dumi/theme";
 export declare const THEME_PREFIX = "dumi-theme-";
 export declare const SP_ROUTE_PREFIX = "~";
+export declare const PICKED_PKG_FIELDS: {
+    name: string;
+    description: string;
+    version: string;
+    license: string;
+    repository: string;
+    author: string;
+    authors: string;
+};

package/dist/constants.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var constants_exports = {};
 __export(constants_exports, {
   LOCAL_THEME_DIR: () => LOCAL_THEME_DIR,
+  PICKED_PKG_FIELDS: () => PICKED_PKG_FIELDS,
   SP_ROUTE_PREFIX: () => SP_ROUTE_PREFIX,
   THEME_PREFIX: () => THEME_PREFIX
 });
@@ -27,9 +28,19 @@ module.exports = __toCommonJS(constants_exports);
 var LOCAL_THEME_DIR = ".dumi/theme";
 var THEME_PREFIX = "dumi-theme-";
 var SP_ROUTE_PREFIX = "~";
+var PICKED_PKG_FIELDS = {
+  name: "",
+  description: "",
+  version: "",
+  license: "",
+  repository: "",
+  author: "",
+  authors: ""
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LOCAL_THEME_DIR,
+  PICKED_PKG_FIELDS,
   SP_ROUTE_PREFIX,
   THEME_PREFIX
 });

package/dist/features/compile.js

@@ -55,7 +55,12 @@ var compile_default = (api) => {
       ...loaderBaseOpts,
       mode: "meta",
       onResolveDemos(demos) {
-        (0, import_assets.addExampleAssets)(demos.map(({ asset }) => asset));
+        const assets = demos.reduce((ret, demo) => {
+          if ("asset" in demo)
+            ret.push(demo.asset);
+          return ret;
+        }, []);
+        (0, import_assets.addExampleAssets)(assets);
       }
     }).end().end().oneOf("md").use("babel-loader").loader(babelInUmi.loader).options(babelInUmi.options).end().use("md-loader").loader(loaderPath).options({
       ...loaderBaseOpts,

package/dist/features/parser.js

@@ -49,17 +49,22 @@ var parser_default = (api) => {
     return memo;
   });
   api.onStart(async () => {
-    const { default: AtomAssetsParser } = await import("../assetParsers/atom");
+    const {
+      default: AtomAssetsParser
+    } = require("../assetParsers/atom");
     api.service.atomParser = new AtomAssetsParser({
       entryFile: api.config.resolve.entryFile,
       resolveDir: api.cwd
     });
-    if (api.env === "production") {
-      api.service.atomParser.parse().then(writeAtomsMetaFile);
-    } else {
+    if (api.env === "development") {
       api.service.atomParser.watch(writeAtomsMetaFile);
     }
   });
+  if (api.env === "production") {
+    api.onGenerateFiles(async () => {
+      writeAtomsMetaFile(await api.service.atomParser.parse());
+    });
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/routes.js

@@ -112,7 +112,7 @@ var routes_default = (api) => {
     }
     Object.entries(pages).forEach(([, route]) => {
       route.parentId = docLayoutId;
-      route.file = import_path.default.resolve(pagesDir, route.file);
+      route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(pagesDir, route.file));
       routes[route.id] = route;
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
@@ -129,7 +129,7 @@ var routes_default = (api) => {
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");
           route.absPath = `/${route.path}`;
         }
-        route.file = import_path.default.resolve(base, route.file);
+        route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base, route.file));
         localizeUmiRoute(route, api.config.locales);
         routes[route.id] = route;
       });
@@ -145,7 +145,7 @@ var routes_default = (api) => {
           path: routePath,
           absPath: `/${routePath}`,
           parentId: docLayoutId,
-          file: import_path.default.resolve(base, file)
+          file: (0, import_plugin_utils.winPath)(import_path.default.resolve(base, file))
         };
         localizeUmiRoute(routes[routeId], api.config.locales);
       });

package/dist/features/tabs.js

@@ -70,9 +70,9 @@ var tabs_default = (api) => {
         routesTabMapping[parentFile].push(routeId);
       } else {
         tabsFromPlugins.forEach((tab) => {
-          var _a;
-          if (!tab.test || route.absPath.match(tab.test)) {
-            routesTabMapping[_a = route.file] ?? (routesTabMapping[_a] = []);
+          var _a, _b;
+          if ((!tab.test || route.absPath.match(tab.test)) && !((_a = routesTabMapping[route.file]) == null ? void 0 : _a.includes(tab.id))) {
+            routesTabMapping[_b = route.file] ?? (routesTabMapping[_b] = []);
             routesTabMapping[route.file].push(tab.id);
           }
         });

package/dist/features/theme/index.js

@@ -123,6 +123,7 @@ 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)))},
       demos,
       components,
       locales,

package/dist/loaders/markdown/index.js

@@ -67,10 +67,13 @@ export const toc = {{{toc}}}
         frontmatter: JSON.stringify(frontmatter),
         toc: JSON.stringify(toc),
         renderAsset: function renderAsset() {
-          let asset = this.asset;
+          if (!("asset" in this))
+            return "null";
+          let { asset } = this;
+          const { sources } = this;
           Object.keys(this.sources).forEach((file) => {
-            asset = import_plugin_utils.lodash.cloneDeep(this.asset);
-            asset.dependencies[file].value = `{{{require('!!raw-loader!${this.sources[file]}?raw').default}}}`;
+            asset = import_plugin_utils.lodash.cloneDeep(asset);
+            asset.dependencies[file].value = `{{{require('!!raw-loader!${sources[file]}?raw').default}}}`;
           });
           return JSON.stringify(asset, null, 2).replace(/"{{{|}}}"/g, "");
         }

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

@@ -16,12 +16,15 @@ declare module 'hast' {
 }
 declare module 'vfile' {
     interface DataMap {
-        demos: {
+        demos: ({
             id: string;
             component: string;
             asset: IParsedBlockAsset['asset'];
             sources: IParsedBlockAsset['sources'];
-        }[];
+        } | {
+            id: string;
+            component: string;
+        })[];
         frontmatter: IRouteMeta['frontmatter'];
         toc: IRouteMeta['toc'];
         embeds?: string[];

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

@@ -150,8 +150,9 @@ function rehypeDemo(opts) {
                 fileAbsPath: opts.fileAbsPath
               });
             }
+            const propDemo = { id: parseOpts.id };
             deferrers.push((0, import_block.default)(parseOpts).then(async ({ asset, sources, frontmatter }) => {
-              var _a3;
+              var _a3, _b;
               const { src, className, ...restAttrs } = codeNode.properties || {};
               const validAssetAttrs = [
                 "title",
@@ -167,7 +168,14 @@ function rehypeDemo(opts) {
                 if (originalProps[key])
                   asset[key] = originalProps[key];
               });
-              Object.assign(previewerProps, await ((_a3 = techStack.generatePreviewerProps) == null ? void 0 : _a3.call(techStack, originalProps, {
+              if (/ inline/.test(String((_a3 = codeNode.data) == null ? void 0 : _a3.meta)) || originalProps.inline) {
+                propDemo.inline = true;
+                return {
+                  id: asset.id,
+                  component
+                };
+              }
+              Object.assign(previewerProps, await ((_b = techStack.generatePreviewerProps) == null ? void 0 : _b.call(techStack, originalProps, {
                 type: codeType,
                 mdAbsPath: opts.fileAbsPath,
                 fileAbsPath: codeType === "external" ? parseOpts.fileAbsPath : void 0,
@@ -194,7 +202,7 @@ function rehypeDemo(opts) {
               };
             }));
             demosPropData.push({
-              demo: { id: parseOpts.id },
+              demo: propDemo,
               previewerProps
             });
           }

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

@@ -27,6 +27,7 @@ __export(rehypeEmbed_exports, {
 });
 module.exports = __toCommonJS(rehypeEmbed_exports);
 var import_path = __toESM(require("path"));
+var import_plugin_utils = require("umi/plugin-utils");
 var import_url = __toESM(require("url"));
 var visit;
 (async () => {
@@ -40,7 +41,7 @@ function rehypeEmbed(opts) {
       if (node.tagName === EMBED_TAG && ((_a = node.properties) == null ? void 0 : _a.hasOwnProperty("src"))) {
         const { src } = node.properties;
         const parsed = import_url.default.parse((src == null ? void 0 : src.toString()) || "");
-        const absPath = import_path.default.resolve(import_path.default.parse(opts.fileAbsPath).dir, parsed.pathname);
+        const absPath = (0, import_plugin_utils.winPath)(import_path.default.resolve(import_path.default.parse(opts.fileAbsPath).dir, parsed.pathname));
         if (absPath) {
           const hash = decodeURIComponent(parsed.hash || "").replace("#", "");
           const query = new URLSearchParams();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",