refactor: provider useDemoData which is given by getDemoById

examples/normal/.dumi/pages/loader-test.tsx

@@ -1,12 +1,2 @@
-import * as demo from '../../docs/index.md?type=demo';
-import * as demoIndex from '../../docs/index.md?type=demo-index';
-import * as frontmatter from '../../docs/index.md?type=frontmatter';
-import * as text from '../../docs/index.md?type=text';
-
-console.log('frontmatter', frontmatter);
-console.log('demo', demo);
-console.log('demoIndex', demoIndex);
-console.log('text', text);
-
 // Customize Page for dumi test
 export default () => 'Customize Dumi Test Page';

examples/normal/src/Foo/demo/work.tsx

@@ -0,0 +1 @@
+export default () => 'External Demo Block';

examples/normal/src/Foo/index.md

@@ -3,3 +3,7 @@
 ```jsx
 export default () => 'Hello Foo!';
 ```
+
+你好，Foo！
+
+<code src="./demo/work.tsx">示例框</code>

src/client/pages/Demo/index.ts

@@ -1,11 +1,17 @@
-import { useParams, useSiteData } from 'dumi';
+import { useDemoData, useParams } from 'dumi';
 import { createElement, type FC } from 'react';
 import './index.less';
 
 const DemoRenderPage: FC = () => {
   const { id } = useParams();
-  const { demos } = useSiteData();
-  const { component } = demos[id!] || {};
+
+  const demoData = useDemoData(id!);
+
+  if (!demoData) {
+    return `Demo '${id}' not found!`;
+  }
+
+  const { component } = demoData;
 
   return component && createElement(component);
 };

src/client/theme-api/DumiDemo/DemoErrorBoundary.tsx

@@ -0,0 +1,27 @@
+import Container from 'dumi/theme/builtins/Container';
+import React, { type FC, type ReactNode } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+
+const DemoErrorBoundary: FC<{ children: ReactNode }> = (props) => (
+  <ErrorBoundary
+    fallbackRender={({ error }: any) => (
+      <Container type="error">
+        <p>
+          <strong>{error.message || 'This demo has been crashed.'}</strong>
+        </p>
+        {error.stack && (
+          <p>
+            <details open>
+              <summary>Error stack</summary>
+              <pre>{error.stack}</pre>
+            </details>
+          </p>
+        )}
+      </Container>
+    )}
+  >
+    {props.children}
+  </ErrorBoundary>
+);
+
+export default DemoErrorBoundary;

src/client/theme-api/DumiDemo/index.tsx

@@ -0,0 +1,70 @@
+import { SP_ROUTE_PREFIX } from '@/constants';
+import { useAppData, useDemoData, useSiteData } from 'dumi';
+import React, { createElement, type FC } from 'react';
+import type { IPreviewerProps } from '../types';
+
+import Previewer from 'dumi/theme/builtins/Previewer';
+import DemoErrorBoundary from './DemoErrorBoundary';
+
+export interface IDumiDemoProps {
+  demo: {
+    id: string;
+    inline?: boolean;
+  };
+  previewerProps: Omit<IPreviewerProps, 'asset' | 'children'>;
+}
+
+const InternalDumiDemo = (props: IDumiDemoProps) => {
+  const { historyType } = useSiteData();
+  const { basename } = useAppData();
+  const demoInfo = useDemoData(props.demo.id);
+
+  // hide debug demo in production
+  if (process.env.NODE_ENV === 'production' && props.previewerProps.debug)
+    return null;
+
+  if (!demoInfo) {
+    return `Demo '${props.demo.id}' not found!`;
+  }
+
+  const { component, asset } = demoInfo;
+
+  const demoNode = (
+    <DemoErrorBoundary>{createElement(component)}</DemoErrorBoundary>
+  );
+
+  if (props.demo.inline) {
+    return demoNode;
+  }
+
+  const isHashRoute = historyType === 'hash';
+
+  return (
+    <Previewer
+      asset={asset}
+      demoUrl={
+        // allow user override demoUrl by frontmatter
+        props.previewerProps.demoUrl ||
+        // when use hash route, browser can automatically handle relative paths starting with #
+        `${isHashRoute ? `#` : ''}${basename}${SP_ROUTE_PREFIX}demos/${
+          props.demo.id
+        }`
+      }
+      {...props.previewerProps}
+    >
+      {props.previewerProps.iframe ? null : demoNode}
+    </Previewer>
+  );
+};
+
+export const DumiDemo: FC<IDumiDemoProps> = React.memo(
+  InternalDumiDemo,
+  (prev, next) => {
+    // compare length for performance
+    return JSON.stringify(prev).length === JSON.stringify(next).length;
+  },
+);
+
+if (process.env.NODE_ENV !== 'production') {
+  InternalDumiDemo.displayName = 'DumiDemo';
+}

src/client/theme-api/context.ts → src/client/theme-api/context/index.ts

@@ -1,20 +1,20 @@
 import type { PICKED_PKG_FIELDS } from '@/constants';
 import type { AtomComponentAsset } from 'dumi-assets-types';
 import { createContext, useContext, type ComponentType } from 'react';
-import type { ILocalesConfig, IPreviewerProps, IThemeConfig } from './types';
+import type { ILocalesConfig, IPreviewerProps, IThemeConfig } from '../types';
+import use from './use';
+
+export type DemoInfo = {
+  component: ComponentType;
+  asset: IPreviewerProps['asset'];
+  routeId: string;
+};
 
 interface ISiteContext {
   pkg: Partial<Record<keyof typeof PICKED_PKG_FIELDS, any>>;
   historyType: 'browser' | 'hash' | 'memory';
   entryExports: Record<string, any>;
-  demos: Record<
-    string,
-    {
-      component: ComponentType;
-      asset: IPreviewerProps['asset'];
-      routeId: string;
-    }
-  >;
+  demos: Record<string, DemoInfo>;
   components: Record<string, AtomComponentAsset>;
   locales: ILocalesConfig;
   themeConfig: IThemeConfig;
@@ -25,6 +25,11 @@ interface ISiteContext {
    * private field, do not use it in your code
    */
   _2_level_nav_available: boolean;
+
+  // =================== Demo Map ===================
+  // Demo map is root providing the id => route mapping info.
+  // Which is generated by `meta-demos` template
+  getDemoById: (id: string) => Promise<DemoInfo | null>;
 }
 
 export const SiteContext = createContext<ISiteContext>({
@@ -38,8 +43,22 @@ export const SiteContext = createContext<ISiteContext>({
   loading: false,
   setLoading: () => {},
   _2_level_nav_available: true,
+  getDemoById: async () => null,
 });
 
 export const useSiteData = () => {
   return useContext(SiteContext);
 };
+
+const cache = new Map<string, Promise<DemoInfo | null>>();
+
+// Async load demo data
+export function useDemoData(demoId: string) {
+  const { getDemoById } = useSiteData();
+
+  if (!cache.has(demoId)) {
+    cache.set(demoId, getDemoById(demoId));
+  }
+
+  return use(cache.get(demoId)!);
+}

src/client/theme-api/context/use.ts

@@ -0,0 +1,30 @@
+// Copy from React official demo.
+// This will be replace if React release new version of use hooks
+type ReactPromise<T> = Promise<T> & {
+  status?: 'pending' | 'fulfilled' | 'rejected';
+  value?: T;
+  reason?: any;
+};
+
+export default function use<T>(promise: ReactPromise<T>): T {
+  if (promise.status === 'fulfilled') {
+    return promise.value!;
+  } else if (promise.status === 'rejected') {
+    throw promise.reason;
+  } else if (promise.status === 'pending') {
+    throw promise;
+  } else {
+    promise.status = 'pending';
+    promise.then(
+      (result) => {
+        promise.status = 'fulfilled';
+        promise.value = result;
+      },
+      (reason) => {
+        promise.status = 'rejected';
+        promise.reason = reason;
+      },
+    );
+    throw promise;
+  }
+}

src/client/theme-api/index.ts

@@ -1,6 +1,4 @@
 export {
-  createIntlCache,
-  defineMessages,
   FormattedDate,
   FormattedDateParts,
   FormattedDisplayName,
@@ -12,17 +10,19 @@ export {
   FormattedRelativeTime,
   FormattedTime,
   FormattedTimeParts,
-  injectIntl,
   IntlContext,
   IntlProvider,
   RawIntlProvider,
+  createIntlCache,
+  defineMessages,
+  injectIntl,
   useIntl,
 } from 'react-intl';
 export { AtomRenderer } from './AtomRenderer';
-export { useSiteData } from './context';
 export { DumiDemo } from './DumiDemo';
 export { DumiDemoGrid } from './DumiDemoGrid';
 export { DumiPage } from './DumiPage';
+export { useDemoData, useSiteData } from './context';
 export { openCodeSandbox } from './openCodeSandbox';
 export { openStackBlitz } from './openStackBlitz';
 export type { IPreviewerProps } from './types';

src/features/meta.ts

@@ -65,6 +65,18 @@ export default (api: IApi) => {
       },
     });
 
+    // generate meta lazy entry
+    api.writeTmpFile({
+      noPluginDir: true,
+      path: 'dumi/meta/demos.ts',
+      tplPath: winPath(join(TEMPLATES_DIR, 'meta-demos.ts.tpl')),
+      context: {
+        metaFiles: parsedMetaFiles.filter((metaFile) =>
+          metaFile.file.endsWith('.md'),
+        ),
+      },
+    });
+
     // generate runtime plugin, to append page meta to route object
     api.writeTmpFile({
       noPluginDir: true,

src/templates/ContextWrapper.ts.tpl

@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { useOutlet, history } from 'dumi';
 import { SiteContext } from '{{{contextPath}}}';
 import { demos, components } from '../meta';
+import { getDemoById } from '../meta/demos';
 import { locales } from '../locales/config';
 {{{defaultExport}}}
 {{{namedExport}}}
@@ -43,6 +44,7 @@ export default function DumiContextWrapper() {
     hostname: {{{hostname}}},
     themeConfig: {{{themeConfig}}},
     _2_level_nav_available: {{{_2_level_nav_available}}},
+    getDemoById,
   };
 
   return (