dumi 2.3.0-rc.0 → 2.3.0

package/dist/assetParsers/block.js

@@ -83,7 +83,7 @@ async function parseBlockAsset(opts) {
                   type: "NPM",
                   value: pkg.version
                 };
-                result.resolveMap[args.path] = resolved;
+                result.resolveMap[args.path] = args.path;
               }
               return { path: args.path, external: true };
             }
@@ -148,7 +148,7 @@ async function parseBlockAsset(opts) {
                   result.frontmatter = frontmatter;
                 }
               }
-              if (!isEntryPoint || !opts.entryPointCode) {
+              if (opts.techStack.runtimeOpts && (!isEntryPoint || !opts.entryPointCode)) {
                 result.resolveMap[filename] = args.path;
               }
               return {

package/dist/client/pages/Demo/index.js

@@ -3,17 +3,23 @@ import { createElement, useEffect } from 'react';
 import { useRenderer } from "../../theme-api/useRenderer";
 import "./index.less";
 var DemoRenderPage = function DemoRenderPage() {
-  var _useParams = useParams(),
-    id = _useParams.id;
+  var params = useParams();
+  var id = params.id;
   var demo = useDemo(id);
-  var canvasRef = useRenderer(demo);
+  var _useRenderer = useRenderer({
+      id: id,
+      component: demo.component,
+      renderOpts: demo.renderOpts
+    }),
+    canvasRef = _useRenderer.canvasRef;
   var _ref = demo || {},
     component = _ref.component,
     renderOpts = _ref.renderOpts;
   var _useLiveDemo = useLiveDemo(id),
     liveDemoNode = _useLiveDemo.node,
     setSource = _useLiveDemo.setSource,
-    liveDemoError = _useLiveDemo.error;
+    liveDemoError = _useLiveDemo.error,
+    loading = _useLiveDemo.loading;
   var finalNode = liveDemoNode || (renderOpts !== null && renderOpts !== void 0 && renderOpts.renderer ? /*#__PURE__*/createElement('div', {
     ref: canvasRef
   }) : component && /*#__PURE__*/createElement(component));
@@ -33,7 +39,7 @@ var DemoRenderPage = function DemoRenderPage() {
 
   // notify parent window that compile done
   useEffect(function () {
-    if (liveDemoNode || liveDemoError) {
+    if (!loading && (liveDemoError || liveDemoNode)) {
       window.postMessage({
         type: 'dumi.liveDemo.compileDone',
         value: {
@@ -41,7 +47,7 @@ var DemoRenderPage = function DemoRenderPage() {
         }
       });
     }
-  }, [liveDemoNode, liveDemoError]);
+  }, [liveDemoError, liveDemoNode, loading]);
   return finalNode;
 };
 export default DemoRenderPage;

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

@@ -15,9 +15,12 @@ var InternalDumiDemo = function InternalDumiDemo(props) {
   var component = demo.component,
     asset = demo.asset,
     renderOpts = demo.renderOpts;
-  var canvasRef = useRenderer(Object.assign(demo, {
-    id: id
-  }));
+  var _useRenderer = useRenderer({
+      id: id,
+      renderOpts: demo.renderOpts,
+      component: demo.component
+    }),
+    canvasRef = _useRenderer.canvasRef;
 
   // hide debug demo in production
   if (process.env.NODE_ENV === 'production' && props.previewerProps.debug) return null;

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

@@ -233,6 +233,7 @@ export type IDemoCompileFn = (code: string, opts: {
     filename: string;
 }) => Promise<string>;
 export type IDemoCancelableFn = (canvas: HTMLElement, component: AgnosticComponentModule) => (() => void) | Promise<() => void>;
+export type IDemoPreflightFn = (component: AgnosticComponentModule) => Promise<void>;
 export type IDemoData = {
     component: ReactComponentType | AgnosticComponentType;
     asset: IPreviewerProps['asset'];
@@ -243,7 +244,15 @@ export type IDemoData = {
          * provide a runtime compile function for compile demo code for live preview
          */
         compile?: IDemoCompileFn;
+        /**
+         * Component rendering function, used to manage the creation and unmount of components
+         */
         renderer?: IDemoCancelableFn;
+        /**
+         * Used to detect initialization errors of components in advance
+         * (if there is an error, the component will not be mounted)
+         */
+        preflight?: IDemoPreflightFn;
     };
 };
 export {};

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

@@ -2,11 +2,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,6 +13,7 @@ import throttle from 'lodash.throttle';
 import { createElement, useCallback, useRef, useState } from 'react';
 import DemoErrorBoundary from "./DumiDemo/DemoErrorBoundary";
 import { useRenderer } from "./useRenderer";
+import { getAgnosticComponentModule } from "./utils";
 var THROTTLE_WAIT = 500;
 function evalCommonJS(js, _ref) {
   var module = _ref.module,
@@ -33,40 +29,38 @@ export var useLiveDemo = function useLiveDemo(id, opts) {
     setLoading = _useState2[1];
   var loadingTimer = useRef();
   var taskToken = useRef();
+  function resetLoadingStatus() {
+    clearTimeout(loadingTimer.current);
+    setLoading(false);
+  }
   var _demo$context = demo.context,
     context = _demo$context === void 0 ? {} : _demo$context,
     asset = demo.asset,
     renderOpts = demo.renderOpts;
-  var _useState3 = useState(),
+  var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
-    component = _useState4[0],
-    setComponent = _useState4[1];
-  var ref = useRenderer(component ? _objectSpread(_objectSpread({
-    id: id
-  }, demo), {}, {
-    component: component
-  }) : Object.assign(demo, {
-    id: id
-  }));
+    error = _useState4[0],
+    setError = _useState4[1];
+  var _useRenderer = useRenderer({
+      id: id,
+      renderOpts: demo.renderOpts,
+      onResolved: function onResolved() {
+        resetLoadingStatus();
+      }
+    }),
+    ref = _useRenderer.canvasRef,
+    setComponent = _useRenderer.setComponent;
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     demoNode = _useState6[0],
     setDemoNode = _useState6[1];
-  var _useState7 = useState(null),
-    _useState8 = _slicedToArray(_useState7, 2),
-    error = _useState8[0],
-    setError = _useState8[1];
   var setSource = useCallback(throttle( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(source) {
       var _opts$containerRef;
-      var resetLoadingStatus, iframeWindow, entryFileName, require, token, entryFileCode, exports, module, renderToStaticMarkupDeferred, _exports, _module, newDemoNode, oError;
+      var iframeWindow, entryFileName, require, token, entryFileCode, exports, module, component, renderToStaticMarkupDeferred, _exports, _module, newDemoNode, oError, shouldSkipError;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            resetLoadingStatus = function _resetLoadingStatus() {
-              clearTimeout(loadingTimer.current);
-              setLoading(false);
-            };
             // set loading status if still compiling after 499ms
             loadingTimer.current = window.setTimeout(function () {
               setLoading(true);
@@ -74,11 +68,11 @@ export var useLiveDemo = function useLiveDemo(id, opts) {
             // make sure timer be fired before next throttle
             THROTTLE_WAIT - 1);
             if (!(opts !== null && opts !== void 0 && opts.iframe && opts !== null && opts !== void 0 && (_opts$containerRef = opts.containerRef) !== null && _opts$containerRef !== void 0 && _opts$containerRef.current)) {
-              _context.next = 8;
+              _context.next = 7;
               break;
             }
             iframeWindow = opts.containerRef.current.querySelector('iframe').contentWindow;
-            _context.next = 6;
+            _context.next = 5;
             return new Promise(function (resolve) {
               var handler = function handler(ev) {
                 if (ev.data.type.startsWith('dumi.liveDemo.compileDone')) {
@@ -93,10 +87,10 @@ export var useLiveDemo = function useLiveDemo(id, opts) {
                 value: source
               });
             });
-          case 6:
-            _context.next = 50;
+          case 5:
+            _context.next = 74;
             break;
-          case 8:
+          case 7:
             entryFileName = Object.keys(asset.dependencies).find(function (k) {
               return asset.dependencies[k].type === 'FILE';
             });
@@ -107,62 +101,77 @@ export var useLiveDemo = function useLiveDemo(id, opts) {
             token = taskToken.current = Math.random();
             entryFileCode = source[entryFileName];
             if (!(renderOpts !== null && renderOpts !== void 0 && renderOpts.compile)) {
-              _context.next = 24;
+              _context.next = 23;
               break;
             }
-            _context.prev = 13;
-            _context.next = 16;
+            _context.prev = 12;
+            _context.next = 15;
             return renderOpts.compile(entryFileCode, {
               filename: entryFileName
             });
-          case 16:
+          case 15:
             entryFileCode = _context.sent;
-            _context.next = 24;
+            _context.next = 23;
             break;
-          case 19:
-            _context.prev = 19;
-            _context.t0 = _context["catch"](13);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](12);
             setError(_context.t0);
             resetLoadingStatus();
             return _context.abrupt("return");
-          case 24:
+          case 23:
             if (!(renderOpts !== null && renderOpts !== void 0 && renderOpts.renderer && renderOpts !== null && renderOpts !== void 0 && renderOpts.compile)) {
-              _context.next = 28;
+              _context.next = 44;
               break;
             }
-            try {
-              exports = {};
-              module = {
-                exports: exports
-              };
-              evalCommonJS(entryFileCode, {
-                exports: exports,
-                module: module,
-                require: require
-              });
-              setComponent(exports);
-              setDemoNode( /*#__PURE__*/createElement('div', {
-                ref: ref
-              }));
-              setError(null);
-            } catch (err) {
-              setError(err);
+            _context.prev = 24;
+            exports = {};
+            module = {
+              exports: exports
+            };
+            evalCommonJS(entryFileCode, {
+              exports: exports,
+              module: module,
+              require: require
+            });
+            _context.next = 30;
+            return getAgnosticComponentModule(exports);
+          case 30:
+            component = _context.sent;
+            if (!renderOpts.preflight) {
+              _context.next = 34;
+              break;
             }
+            _context.next = 34;
+            return renderOpts.preflight(component);
+          case 34:
+            setComponent(component);
+            setDemoNode( /*#__PURE__*/createElement('div', {
+              ref: ref
+            }));
+            setError(null);
+            _context.next = 43;
+            break;
+          case 39:
+            _context.prev = 39;
+            _context.t1 = _context["catch"](24);
+            setError(_context.t1);
             resetLoadingStatus();
+          case 43:
             return _context.abrupt("return");
-          case 28:
-            _context.prev = 28;
+          case 44:
+            _context.prev = 44;
             // load renderToStaticMarkup in async way
             renderToStaticMarkupDeferred = import('react-dom/server').then(function (_ref3) {
               var renderToStaticMarkup = _ref3.renderToStaticMarkup;
               return renderToStaticMarkup;
             }); // skip current task if another task is running
             if (!(token !== taskToken.current)) {
-              _context.next = 32;
+              _context.next = 48;
               break;
             }
             return _context.abrupt("return");
-          case 32:
+          case 48:
             _exports = {};
             _module = {
               exports: _exports
@@ -182,29 +191,42 @@ export var useLiveDemo = function useLiveDemo(id, opts) {
             };
 
             // check component is able to render, to avoid show react overlay error
-            _context.next = 40;
+            _context.prev = 54;
+            _context.next = 57;
             return renderToStaticMarkupDeferred;
-          case 40:
-            _context.t1 = _context.sent;
-            (0, _context.t1)(newDemoNode);
+          case 57:
+            _context.t2 = _context.sent;
+            (0, _context.t2)(newDemoNode);
+            _context.next = 66;
+            break;
+          case 61:
+            _context.prev = 61;
+            _context.t3 = _context["catch"](54);
+            shouldSkipError = _context.t3.message.includes('Unable to find node on an unmounted component') || _context.t3.message.includes('Portals are not currently supported by the server renderer');
+            if (shouldSkipError) {
+              _context.next = 66;
+              break;
+            }
+            throw _context.t3;
+          case 66:
             console.error = oError;
 
             // set new demo node with passing source
             setDemoNode(newDemoNode);
             setError(null);
-            _context.next = 50;
+            _context.next = 74;
             break;
-          case 47:
-            _context.prev = 47;
-            _context.t2 = _context["catch"](28);
-            setError(_context.t2);
-          case 50:
+          case 71:
+            _context.prev = 71;
+            _context.t4 = _context["catch"](44);
+            setError(_context.t4);
+          case 74:
             resetLoadingStatus();
-          case 51:
+          case 75:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[13, 19], [28, 47]]);
+      }, _callee, null, [[12, 18], [24, 39], [44, 71], [54, 61]]);
     }));
     return function (_x2) {
       return _ref2.apply(this, arguments);

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

@@ -1,5 +1,12 @@
 /// <reference types="react" />
-import type { IDemoData } from './types';
-export declare const useRenderer: ({ id, component, renderOpts, }: IDemoData & {
+import type { AgnosticComponentType, IDemoData } from './types';
+export interface UseRendererOptions {
     id: string;
-}) => import("react").RefObject<HTMLDivElement>;
+    component?: AgnosticComponentType;
+    renderOpts: IDemoData['renderOpts'];
+    onResolved?: () => void;
+}
+export declare const useRenderer: ({ id, component, renderOpts, onResolved, }: UseRendererOptions) => {
+    canvasRef: import("react").RefObject<HTMLDivElement>;
+    setComponent: import("react").Dispatch<import("react").SetStateAction<AgnosticComponentType | null>>;
+};

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

@@ -2,22 +2,41 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import { useEffect, useRef } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useEffect, useRef, useState } from 'react';
+import { getAgnosticComponentModule } from "./utils";
+
 // maintain all the mounted instance
 var map = new Map();
 export var useRenderer = function useRenderer(_ref) {
   var id = _ref.id,
     component = _ref.component,
-    renderOpts = _ref.renderOpts;
+    renderOpts = _ref.renderOpts,
+    onResolved = _ref.onResolved;
+  var _useState = useState(component ? getAgnosticComponentModule(component) : null),
+    _useState2 = _slicedToArray(_useState, 2),
+    deferedComponent = _useState2[0],
+    setComponent = _useState2[1];
   var canvasRef = useRef(null);
   var teardownRef = useRef(function () {});
-  var prevComponent = useRef(component);
-
-  // forcibly destroyed
-  if (prevComponent.current !== component) {
-    var teardown = map.get(id);
-    teardown === null || teardown === void 0 ? void 0 : teardown();
-    prevComponent.current = component;
+  var prevCanvas = useRef(canvasRef.current);
+  var resolving = useRef(false);
+  if (prevCanvas.current !== canvasRef.current) {
+    if (prevCanvas.current === null) {
+      // When first render, component maintained by the parent component userRenderer may be removed.
+      // The hosted element should be added back
+      var handler = map.get(id);
+      if (handler !== null && handler !== void 0 && handler.teardown && handler !== null && handler !== void 0 && handler.hostElement && canvasRef.current) {
+        canvasRef.current.appendChild(handler.hostElement);
+        teardownRef.current = handler.teardown;
+      }
+    }
+    prevCanvas.current = canvasRef.current;
   }
   var renderer = renderOpts === null || renderOpts === void 0 ? void 0 : renderOpts.renderer;
   useEffect(function () {
@@ -26,63 +45,77 @@ export var useRenderer = function useRenderer(_ref) {
     }
     function _resolveRender() {
       _resolveRender = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _module$default;
-        var module, teardown;
+        var legacyHandler, legacyTeardown, comp, hostElement, _legacyHandler$hostEl, teardown;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(!canvasRef.current || !renderer || !component)) {
+              if (!(!canvasRef.current || !renderer || !deferedComponent)) {
                 _context.next = 2;
                 break;
               }
               return _context.abrupt("return");
             case 2:
-              if (!map.get(id)) {
-                _context.next = 4;
+              legacyHandler = map.get(id);
+              if (!resolving.current) {
+                _context.next = 5;
                 break;
               }
               return _context.abrupt("return");
-            case 4:
-              map.set(id, function () {});
-              if (!(component instanceof Promise)) {
-                _context.next = 11;
-                break;
-              }
-              _context.next = 8;
-              return component;
-            case 8:
-              _context.t0 = _context.sent;
-              _context.next = 12;
-              break;
-            case 11:
-              _context.t0 = component;
-            case 12:
-              module = _context.t0;
-              module = (_module$default = module.default) !== null && _module$default !== void 0 ? _module$default : module;
-              _context.next = 16;
-              return renderer(canvasRef.current, module);
-            case 16:
+            case 5:
+              resolving.current = true;
+              legacyTeardown = legacyHandler === null || legacyHandler === void 0 ? void 0 : legacyHandler.teardown;
+              _context.next = 9;
+              return deferedComponent;
+            case 9:
+              comp = _context.sent;
+              hostElement = document.createElement('div');
+              _context.prev = 11;
+              canvasRef.current.appendChild(hostElement);
+              _context.next = 15;
+              return renderer(hostElement, comp);
+            case 15:
               teardown = _context.sent;
+              legacyTeardown === null || legacyTeardown === void 0 ? void 0 : legacyTeardown();
+              legacyHandler === null || legacyHandler === void 0 ? void 0 : (_legacyHandler$hostEl = legacyHandler.hostElement) === null || _legacyHandler$hostEl === void 0 ? void 0 : _legacyHandler$hostEl.remove();
               // remove instance when react component is unmounted
               teardownRef.current = function () {
                 teardown();
+                hostElement.remove();
                 map.delete(id);
               };
-              map.set(id, teardownRef.current);
-            case 19:
+              map.set(id, {
+                teardown: teardownRef.current,
+                hostElement: hostElement
+              });
+              _context.next = 26;
+              break;
+            case 22:
+              _context.prev = 22;
+              _context.t0 = _context["catch"](11);
+              hostElement.remove();
+              throw _context.t0;
+            case 26:
+              _context.prev = 26;
+              resolving.current = false;
+              onResolved === null || onResolved === void 0 ? void 0 : onResolved();
+              return _context.finish(26);
+            case 30:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[11, 22, 26, 30]]);
       }));
       return _resolveRender.apply(this, arguments);
     }
     resolveRender();
-  }, [canvasRef.current, component, renderer]);
+  }, [canvasRef.current, deferedComponent, renderer]);
   useEffect(function () {
     return function () {
       return teardownRef.current();
     };
   }, []);
-  return canvasRef;
+  return {
+    canvasRef: canvasRef,
+    setComponent: setComponent
+  };
 };

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

@@ -1,6 +1,6 @@
 import { PluginManager } from 'dumi';
-import { useEffect } from 'react';
-import type { ILocale, INav, INavItem, IRouteMeta, IRoutesById, IUserNavValue } from './types';
+import { useLayoutEffect } from 'react';
+import type { AgnosticComponentModule, IDemoData, ILocale, INav, INavItem, IRouteMeta, IRoutesById, IUserNavValue } from './types';
 /**
  * private instance, do not use it in your code
  */
@@ -13,7 +13,7 @@ export declare const useLocaleDocRoutes: () => IRoutesById;
  * @returns code string
  */
 export declare const genReactRenderCode: (version: string) => string;
-export declare const useIsomorphicLayoutEffect: typeof useEffect;
+export declare const useIsomorphicLayoutEffect: typeof useLayoutEffect;
 /**
  * common comparer for sidebar/nav items
  */
@@ -28,3 +28,4 @@ export declare const useRouteDataComparer: <T extends {
  */
 export declare const pickRouteSortMeta: (original: Partial<Pick<INavItem, 'order' | 'title'>>, field: 'nav' | 'nav.second' | 'group', fm: IRouteMeta['frontmatter']) => Partial<Pick<INavItem, "title" | "order">>;
 export declare function getLocaleNav(nav: IUserNavValue | INav, locale: ILocale): import("./types").IUserNavItems;
+export declare function getAgnosticComponentModule(component: IDemoData['component']): Promise<AgnosticComponentModule>;

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

@@ -1,3 +1,6 @@
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -96,4 +99,37 @@ export var pickRouteSortMeta = function pickRouteSortMeta(original, field, fm) {
 };
 export function getLocaleNav(nav, locale) {
   return Array.isArray(nav) ? nav : nav[locale.id];
+}
+export function getAgnosticComponentModule(_x2) {
+  return _getAgnosticComponentModule.apply(this, arguments);
+}
+function _getAgnosticComponentModule() {
+  _getAgnosticComponentModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(component) {
+    var _mod$default;
+    var mod;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(component instanceof Promise)) {
+            _context.next = 6;
+            break;
+          }
+          _context.next = 3;
+          return component;
+        case 3:
+          _context.t0 = _context.sent;
+          _context.next = 7;
+          break;
+        case 6:
+          _context.t0 = component;
+        case 7:
+          mod = _context.t0;
+          return _context.abrupt("return", (_mod$default = mod.default) !== null && _mod$default !== void 0 ? _mod$default : mod);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getAgnosticComponentModule.apply(this, arguments);
 }

package/dist/features/compile/index.js

@@ -86,6 +86,9 @@ var compile_default = (api) => {
   api.chainWebpack(async (memo) => {
     const babelInUmi = memo.module.rule("src").use("babel-loader").entries();
     const loaderPath = require.resolve("../../loaders/markdown");
+    memo.resolve.merge({
+      conditionNames: ["require", "node", "import"]
+    });
     const loaderBaseOpts = {
       techStacks,
       cwd: api.cwd,

package/dist/loaders/markdown/index.js

@@ -35,13 +35,16 @@ module.exports = __toCommonJS(markdown_exports);
 var import_tabs = require("../../features/tabs");
 var import_utils = require("../../utils");
 var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_transformer = __toESM(require("./transformer"));
 var import_rehypeText = require("./transformer/rehypeText");
 function getDemoSourceFiles(demos = []) {
   return demos.reduce((ret, demo) => {
     if ("resolveMap" in demo) {
-      ret.push(...Object.values(demo.resolveMap));
+      ret.push(
+        ...Object.values(demo.resolveMap).filter((p) => import_path.default.isAbsolute(p))
+      );
     }
     return ret;
   }, []);
@@ -114,11 +117,11 @@ export const demos = {
           return "undefined";
         const entryFileName = Object.keys(this.asset.dependencies)[0];
         const context = Object.entries(this.resolveMap).reduce(
-          (acc, [key, path]) => ({
+          (acc, [key, path2]) => ({
             ...acc,
             // omit entry file
             ...key !== entryFileName ? {
-              [key]: `{{{require('${path}')}}}`
+              [key]: `{{{require('${path2}')}}}`
             } : {}
           }),
           {}
@@ -145,6 +148,12 @@ export const demos = {
             renderOpts.rendererPath
           )}')).default,`);
         }
+        if (renderOpts.preflightPath) {
+          propertyArray.push(`
+            preflight: (await import('${(0, import_plugin_utils.winPath)(
+            renderOpts.preflightPath
+          )}')).default,`);
+        }
         if (propertyArray.length === 0)
           return "undefined";
         return `{

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

@@ -26,6 +26,7 @@ declare module 'vfile' {
             renderOpts: {
                 type?: string;
                 rendererPath?: string;
+                preflightPath?: string;
                 compilePath?: string;
             };
         } | {
@@ -34,6 +35,7 @@ declare module 'vfile' {
             renderOpts: {
                 type?: string;
                 rendererPath?: string;
+                preflightPath?: string;
                 compilePath?: string;
             };
         })[];

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

@@ -294,7 +294,8 @@ function rehypeDemo(opts) {
                       id: asset.id,
                       component,
                       renderOpts: {
-                        rendererPath: runtimeOpts == null ? void 0 : runtimeOpts.rendererPath
+                        rendererPath: runtimeOpts == null ? void 0 : runtimeOpts.rendererPath,
+                        preflightPath: runtimeOpts == null ? void 0 : runtimeOpts.preflightPath
                       }
                     };
                   }
@@ -332,7 +333,8 @@ function rehypeDemo(opts) {
                     ) : resolveMap,
                     renderOpts: {
                       rendererPath: runtimeOpts == null ? void 0 : runtimeOpts.rendererPath,
-                      compilePath: runtimeOpts == null ? void 0 : runtimeOpts.compilePath
+                      compilePath: runtimeOpts == null ? void 0 : runtimeOpts.compilePath,
+                      preflightPath: runtimeOpts == null ? void 0 : runtimeOpts.preflightPath
                     }
                   };
                 }

package/dist/types.d.ts

@@ -58,6 +58,11 @@ export type IDumiTechStackOnBlockLoadArgs = OnLoadArgs & {
     filename: string;
 };
 export interface IDumiTechStackRuntimeOpts {
+    /**
+     * Component detection function path,
+     * used to detect errors that occur from application creation to component mounting.
+     */
+    preflightPath?: string;
     /**
      * path of the cancelable{@link IDemoCancelableFn} function
      * that manipulate(mount/unmount) third-party framework component

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.3.0-rc.0",
+  "version": "2.3.0",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",
@@ -163,7 +163,7 @@
     "typescript": "~5.0.4",
     "vitest": "^0.33.0",
     "zx": "^7.2.3",
-    "dumi-theme-mobile": "2.3.0-rc.0"
+    "dumi-theme-mobile": "2.3.0"
   },
   "peerDependencies": {
     "react": ">=16.8",

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

@@ -64,9 +64,11 @@ var ContentFooter = function ContentFooter() {
   }, [showLastUpdated]);
   return /*#__PURE__*/React.createElement("footer", {
     className: "dumi-default-content-footer"
-  }, /*#__PURE__*/React.createElement("dl", null, showLastUpdated && /*#__PURE__*/React.createElement("dd", null, /*#__PURE__*/React.createElement(IconClock, null), /*#__PURE__*/React.createElement(FormattedMessage, {
+  }, /*#__PURE__*/React.createElement("dl", null, showLastUpdated && /*#__PURE__*/React.createElement("dd", null, /*#__PURE__*/React.createElement(IconClock, null), /*#__PURE__*/React.createElement("span", {
+    className: "dumi-default-mobile-hidden"
+  }, /*#__PURE__*/React.createElement(FormattedMessage, {
     id: "content.footer.last.updated"
-  }), /*#__PURE__*/React.createElement("time", {
+  })), /*#__PURE__*/React.createElement("time", {
     dateTime: isoLastUpdated
   }, lastUpdated)), showEditLink && /*#__PURE__*/React.createElement("dd", null, /*#__PURE__*/React.createElement("a", {
     target: "_blank",

package/theme-default/slots/ContentFooter/index.less

@@ -33,6 +33,11 @@
 
     dd {
       margin: 0;
+      @media @mobile {
+        .dumi-default-mobile-hidden {
+          display: none;
+        }
+      }
 
       svg {
         margin-inline-end: 4px;