@blocklet/launcher-layout 2.3.18 → 2.3.20

package/es/markdown-body.js

@@ -0,0 +1,52 @@
+import PropTypes from 'prop-types';
+import styled from '@emotion/styled';
+import { Box } from '@mui/material';
+import { jsx as _jsx } from "react/jsx-runtime";
+function MarkdownBody({
+  children
+}) {
+  return /*#__PURE__*/_jsx(Root, {
+    children: children
+  });
+}
+const codeFont = 'source-code-pro, Menlo, Monaco, Consolas, Courier New, monospace !important';
+const Root = styled(Box)`
+  .highlight pre,
+  pre {
+    border-radius: 5px;
+  }
+  code {
+    font-family: ${codeFont};
+  }
+  pre code {
+    font-size: 14px;
+    font-family: ${codeFont};
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-weight: 700 !important;
+    font-size: 1.2rem !important;
+    line-height: 1.5 !important;
+    margin-bottom: 16px;
+    margin-top: 24px;
+    border-bottom: initial !important;
+  }
+
+  .CodeMirror pre {
+    background: #f6f8fa !important;
+  }
+
+  .anchor {
+    display: none;
+  }
+`;
+MarkdownBody.propTypes = {
+  children: PropTypes.any.isRequired
+};
+MarkdownBody.defaultProps = {};
+export default MarkdownBody;

package/es/wizard/wizard-desc.js

@@ -1,14 +1,15 @@
 import { createElement } from 'react';
 import PropTypes from 'prop-types';
 import { getDisplayName } from '@blocklet/meta/lib/util';
+import DID from '@arcblock/ux/lib/DID';
 import get from 'lodash/get';
 import styled from '@emotion/styled';
+import MarkdownPreview from '@uiw/react-markdown-preview';
+import { Box, Table, TableBody, TableCell, TableContainer, TableRow, Typography } from '@mui/material';
 import RehypeReact from 'rehype-react';
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableContainer from '@mui/material/TableContainer';
-import TableRow from '@mui/material/TableRow';
+import joinURL from 'url-join';
+import { useCreation, useRequest } from 'ahooks';
+import MarkdownBody from '../markdown-body';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const isFreeBlocklet = meta => {
   if (!meta.payment) {
@@ -56,11 +57,61 @@ function WizardDesc({
   const {
     data
   } = blockletMeta;
+
+  // FIXME: @zhanghan 暂且假定这里是有 registryUrl 的值的，后续需要更好的方式来判断一个 blocklet 来源于哪个 registryUrl
+  const {
+    registryUrl,
+    did
+  } = data;
   const name = getDisplayName({
     meta: data
   });
+  const readmeState = useRequest(() => {
+    if (registryUrl && did) {
+      return fetch(joinURL(registryUrl, '/api/blocklets', did, 'readme')).then(res => res.json());
+    }
+    return null;
+  }, {
+    refreshDeps: [registryUrl, did]
+  });
+  const markdownSource = useCreation(() => {
+    if (!readmeState.data) {
+      return '';
+    }
+    return readmeState.data[locale] || readmeState.data.en || readmeState.data[Object.keys(readmeState.data)[0]];
+  }, [readmeState]);
   const blockletDesc = data && data.htmlAst ? renderAst(data.htmlAst) : '';
   const isFree = isFreeBlocklet(data);
+  let authorInfo = get(data, 'owner.fullName');
+  if (authorInfo) {
+    const ownerDid = get(data, 'owner.did');
+    if (ownerDid) {
+      authorInfo = /*#__PURE__*/_jsxs(Box, {
+        sx: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: 1
+        },
+        children: [authorInfo, /*#__PURE__*/_jsx(DID, {
+          sx: {
+            lineHeight: 'initial',
+            '&::before': {
+              content: '"("'
+            },
+            '&::after': {
+              content: '")"'
+            }
+          },
+          did: ownerDid,
+          compact: true,
+          size: 14,
+          locale: locale
+        })]
+      });
+    }
+  } else {
+    authorInfo = get(data, 'author.name');
+  }
   const infos = [{
     key: get(localeData[locale], 'appinfo.name'),
     value: getDisplayName({
@@ -71,7 +122,7 @@ function WizardDesc({
     value: data.version
   }, {
     key: get(localeData[locale], 'appinfo.author'),
-    value: get(data, 'author.name')
+    value: authorInfo
   }, {
     type: 'description',
     key: get(localeData[locale], 'appinfo.description'),
@@ -190,12 +241,55 @@ function WizardDesc({
           })
         })
       })
-    }), /*#__PURE__*/_jsx("div", {
+    }), markdownSource ? /*#__PURE__*/_jsxs("div", {
+      className: "app-overview",
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "h5",
+        gutterBottom: true,
+        children: get(localeData[locale], 'appinfo.overview')
+      }), /*#__PURE__*/_jsx(MarkdownBody, {
+        children: /*#__PURE__*/_jsx(PostContent, {
+          component: "div",
+          className: "content-wrapper post-content",
+          children: /*#__PURE__*/_jsx(MarkdownPreview, {
+            source: markdownSource
+            // 先保留后面两个参数，可用于精细判断
+            // eslint-disable-next-line no-unused-vars
+            ,
+            urlTransform: (url, key, node) => {
+              if (url.startsWith('/')) {
+                return joinURL(registryUrl, url);
+              }
+              return url;
+            }
+          })
+        })
+      })]
+    }) : blockletDesc ? /*#__PURE__*/_jsx("div", {
       className: "app-overview",
       children: blockletDesc
-    })]
+    }) : null]
   });
 }
+const PostContent = styled(Typography)`
+  width: 100%;
+  word-wrap: break-word;
+  word-break: break-word;
+  line-height: 1.5em;
+  min-height: 10vh;
+  margin-bottom: 40px !important;
+
+  .alert-content {
+    max-width: 100%;
+    p:last-of-type {
+      margin-bottom: 0;
+    }
+  }
+
+  iframe {
+    width: 100% !important;
+  }
+`;
 const Container = styled.div`
   .info-table {
     a {

package/lib/compact-layout.js

@@ -9,8 +9,8 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function CompactLayout(_ref) {
   let {
     children,

package/lib/content.js

@@ -8,8 +8,8 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function Content(_ref) {
   let {
     children

package/lib/context/step.js

@@ -8,7 +8,7 @@ exports.useStepContext = useStepContext;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const StepContext = /*#__PURE__*/(0, _react.createContext)();
 const {
   Provider

package/lib/header.js

@@ -17,8 +17,8 @@ var _blockletDefaultLogo = _interopRequireDefault(require("./assets/blocklet-def
 var _locale = require("./locale");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2, _templateObject3;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function AppHeader(_ref) {
   let {
     blockletMeta,

package/lib/index.js

@@ -24,15 +24,15 @@ var _nav = _interopRequireDefault(require("./nav"));
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["blockletMeta", "loading", "children", "logoUrl", "locale", "header", "headerEndAddons", "pcWidth", "pcHeight", "navLogo", "useOfSkeleton", "stepTip", "navSubTitle", "contentMaxWidth", "theme"];
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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 _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 const HEADER_HEIGHT_MD = '72px';
 const MobileContent = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  display: flex;\n  overflow: hidden;\n  width: 100%;\n  height: 100%;\n  padding-top: ", ";\n"])), HEADER_HEIGHT_MD);
 const PcContent = _styled.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  min-width: 900px;\n  max-width: ", ";\n  max-height: 880px;\n  border-radius: 8px;\n  background-color: #fff;\n  width: ", ";\n  height: ", ";\n\n  @media (max-height: 1200px) {\n    margin-top: ", ";\n    height: 100%;\n    max-height: 100%;\n  }\n"])), props => props.contentMaxWidth, props => props.width || '80%', props => props.height || '80%', HEADER_HEIGHT_MD);

package/lib/launch-result-message.js

@@ -13,15 +13,15 @@ var _PriorityHigh = _interopRequireDefault(require("@mui/icons-material/Priority
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 const _excluded = ["variant", "title", "subTitle", "footer"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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 _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
 function LaunchResultMessage(_ref) {
   let {
       variant,

package/lib/markdown-body.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _material = require("@mui/material");
+var _jsxRuntime = require("react/jsx-runtime");
+var _templateObject;
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
+function MarkdownBody(_ref) {
+  let {
+    children
+  } = _ref;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Root, {
+    children: children
+  });
+}
+const codeFont = 'source-code-pro, Menlo, Monaco, Consolas, Courier New, monospace !important';
+const Root = (0, _styled.default)(_material.Box)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .highlight pre,\n  pre {\n    border-radius: 5px;\n  }\n  code {\n    font-family: ", ";\n  }\n  pre code {\n    font-size: 14px;\n    font-family: ", ";\n  }\n\n  h1,\n  h2,\n  h3,\n  h4,\n  h5,\n  h6 {\n    font-weight: 700 !important;\n    font-size: 1.2rem !important;\n    line-height: 1.5 !important;\n    margin-bottom: 16px;\n    margin-top: 24px;\n    border-bottom: initial !important;\n  }\n\n  .CodeMirror pre {\n    background: #f6f8fa !important;\n  }\n\n  .anchor {\n    display: none;\n  }\n"])), codeFont, codeFont);
+MarkdownBody.propTypes = {
+  children: _propTypes.default.any.isRequired
+};
+MarkdownBody.defaultProps = {};
+var _default = exports.default = MarkdownBody;

package/lib/nav.js

@@ -12,8 +12,8 @@ var _step = require("./context/step");
 var _header = _interopRequireDefault(require("./header"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function Nav(_ref) {
   let {
     blockletMeta,

package/lib/page-header.js

@@ -10,15 +10,15 @@ var _ArrowBackIos = _interopRequireDefault(require("@mui/icons-material/ArrowBac
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 const _excluded = ["title", "subTitle", "onClickBack"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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 _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
 function PageHeader(_ref) {
   let {
       title,

package/lib/theme-provider.js

@@ -10,7 +10,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react2 = require("@emotion/react");
 var _Theme = require("@arcblock/ux/lib/Theme");
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const defaultTheme = (0, _Theme.create)({});
 const ThemeContext = /*#__PURE__*/(0, _react.createContext)({});
 function ThemeProvider() {

package/lib/wizard/server-eula.js

@@ -14,8 +14,8 @@ var _submit = _interopRequireDefault(require("@blocklet/launcher-ux/lib/hot-key/
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 /* eslint-disable react/jsx-wrap-multilines */
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function ServerEula(_ref) {
   let {
     onContinue,

package/lib/wizard/wizard-desc.js

@@ -7,18 +7,19 @@ exports.default = void 0;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _util = require("@blocklet/meta/lib/util");
+var _DID = _interopRequireDefault(require("@arcblock/ux/lib/DID"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _reactMarkdownPreview = _interopRequireDefault(require("@uiw/react-markdown-preview"));
+var _material = require("@mui/material");
 var _rehypeReact = _interopRequireDefault(require("rehype-react"));
-var _Table = _interopRequireDefault(require("@mui/material/Table"));
-var _TableBody = _interopRequireDefault(require("@mui/material/TableBody"));
-var _TableCell = _interopRequireDefault(require("@mui/material/TableCell"));
-var _TableContainer = _interopRequireDefault(require("@mui/material/TableContainer"));
-var _TableRow = _interopRequireDefault(require("@mui/material/TableRow"));
+var _urlJoin = _interopRequireDefault(require("url-join"));
+var _ahooks = require("ahooks");
+var _markdownBody = _interopRequireDefault(require("../markdown-body"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+var _templateObject, _templateObject2;
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 const isFreeBlocklet = meta => {
   if (!meta.payment) {
     return true;
@@ -66,11 +67,61 @@ function WizardDesc(_ref) {
   const {
     data
   } = blockletMeta;
+
+  // FIXME: @zhanghan 暂且假定这里是有 registryUrl 的值的，后续需要更好的方式来判断一个 blocklet 来源于哪个 registryUrl
+  const {
+    registryUrl,
+    did
+  } = data;
   const name = (0, _util.getDisplayName)({
     meta: data
   });
+  const readmeState = (0, _ahooks.useRequest)(() => {
+    if (registryUrl && did) {
+      return fetch((0, _urlJoin.default)(registryUrl, '/api/blocklets', did, 'readme')).then(res => res.json());
+    }
+    return null;
+  }, {
+    refreshDeps: [registryUrl, did]
+  });
+  const markdownSource = (0, _ahooks.useCreation)(() => {
+    if (!readmeState.data) {
+      return '';
+    }
+    return readmeState.data[locale] || readmeState.data.en || readmeState.data[Object.keys(readmeState.data)[0]];
+  }, [readmeState]);
   const blockletDesc = data && data.htmlAst ? renderAst(data.htmlAst) : '';
   const isFree = isFreeBlocklet(data);
+  let authorInfo = (0, _get.default)(data, 'owner.fullName');
+  if (authorInfo) {
+    const ownerDid = (0, _get.default)(data, 'owner.did');
+    if (ownerDid) {
+      authorInfo = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+        sx: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: 1
+        },
+        children: [authorInfo, /*#__PURE__*/(0, _jsxRuntime.jsx)(_DID.default, {
+          sx: {
+            lineHeight: 'initial',
+            '&::before': {
+              content: '"("'
+            },
+            '&::after': {
+              content: '")"'
+            }
+          },
+          did: ownerDid,
+          compact: true,
+          size: 14,
+          locale: locale
+        })]
+      });
+    }
+  } else {
+    authorInfo = (0, _get.default)(data, 'author.name');
+  }
   const infos = [{
     key: (0, _get.default)(localeData[locale], 'appinfo.name'),
     value: (0, _util.getDisplayName)({
@@ -81,7 +132,7 @@ function WizardDesc(_ref) {
     value: data.version
   }, {
     key: (0, _get.default)(localeData[locale], 'appinfo.author'),
-    value: (0, _get.default)(data, 'author.name')
+    value: authorInfo
   }, {
     type: 'description',
     key: (0, _get.default)(localeData[locale], 'appinfo.description'),
@@ -173,13 +224,13 @@ function WizardDesc(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
     children: [handleDescEle || descEle, /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "info-table",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TableContainer.default, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Table.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableContainer, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Table, {
           size: "small",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TableBody.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
             children: infos.map(e => {
-              return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_TableRow.default, {
-                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_TableCell.default, {
+              return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
                   component: "th",
                   scope: "row",
                   style: {
@@ -192,7 +243,7 @@ function WizardDesc(_ref) {
                     },
                     children: e.key
                   })
-                }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_TableCell.default, {
+                }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
                   children: e.value
                 })]
               }, e.key);
@@ -200,13 +251,38 @@ function WizardDesc(_ref) {
           })
         })
       })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    }), markdownSource ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "app-overview",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+        variant: "h5",
+        gutterBottom: true,
+        children: (0, _get.default)(localeData[locale], 'appinfo.overview')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_markdownBody.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(PostContent, {
+          component: "div",
+          className: "content-wrapper post-content",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactMarkdownPreview.default, {
+            source: markdownSource
+            // 先保留后面两个参数，可用于精细判断
+            // eslint-disable-next-line no-unused-vars
+            ,
+            urlTransform: (url, key, node) => {
+              if (url.startsWith('/')) {
+                return (0, _urlJoin.default)(registryUrl, url);
+              }
+              return url;
+            }
+          })
+        })
+      })]
+    }) : blockletDesc ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "app-overview",
       children: blockletDesc
-    })]
+    }) : null]
   });
 }
-const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .info-table {\n    a {\n      word-break: break-all;\n    }\n  }\n  .app-overview {\n    font-size: 16px;\n    margin: 16px 0 0 16px;\n    h1 {\n      margin: 8px 0;\n      font-size: 20px;\n    }\n    h2 {\n      margin: 8px 0;\n      font-size: 18px;\n    }\n    ul {\n      display: block;\n      list-style-type: disc;\n      padding-left: 2em;\n      li {\n        display: list-item;\n        list-style: disc;\n      }\n    }\n    blockquote {\n      margin-left: 2em;\n    }\n  }\n"])));
+const PostContent = (0, _styled.default)(_material.Typography)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  word-wrap: break-word;\n  word-break: break-word;\n  line-height: 1.5em;\n  min-height: 10vh;\n  margin-bottom: 40px !important;\n\n  .alert-content {\n    max-width: 100%;\n    p:last-of-type {\n      margin-bottom: 0;\n    }\n  }\n\n  iframe {\n    width: 100% !important;\n  }\n"])));
+const Container = _styled.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .info-table {\n    a {\n      word-break: break-all;\n    }\n  }\n  .app-overview {\n    font-size: 16px;\n    margin: 16px 0 0 16px;\n    h1 {\n      margin: 8px 0;\n      font-size: 20px;\n    }\n    h2 {\n      margin: 8px 0;\n      font-size: 18px;\n    }\n    ul {\n      display: block;\n      list-style-type: disc;\n      padding-left: 2em;\n      li {\n        display: list-item;\n        list-style: disc;\n      }\n    }\n    blockquote {\n      margin-left: 2em;\n    }\n  }\n"])));
 WizardDesc.propTypes = {
   blockletMeta: _propTypes.default.object.isRequired,
   locale: _propTypes.default.string.isRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-layout",
-  "version": "2.3.18",
+  "version": "2.3.20",
   "description": "Common ux components of launcher",
   "publishConfig": {
     "access": "public"
@@ -39,19 +39,21 @@
     "url": "https://github.com/blocklet/launcher/issues"
   },
   "peerDependencies": {
-    "react": ">=18.1.0"
-  },
-  "dependencies": {
     "@arcblock/did-connect": "^2.9.76",
-    "@arcblock/icons": "^2.9.76",
     "@arcblock/ux": "^2.9.76",
-    "@blocklet/launcher-util": "2.3.18",
-    "@blocklet/launcher-ux": "2.3.18",
+    "@mui/icons-material": "^5.15.15",
+    "@mui/material": "^5.15.15",
+    "react": "^18.2.0"
+  },
+  "dependencies": {
+    "@arcblock/icons": "^2.9.88",
+    "@blocklet/launcher-util": "2.3.20",
+    "@blocklet/launcher-ux": "2.3.20",
     "@blocklet/meta": "^1.16.26",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.15.15",
-    "@mui/material": "^5.15.15",
+    "@uiw/react-markdown-preview": "^5.1.1",
+    "ahooks": "^3.8.0",
     "is-empty": "^1.2.0",
     "lodash": "^4.17.21",
     "prop-types": "^15.8.1",
@@ -59,13 +61,13 @@
     "url-join": "^4.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.1",
-    "@babel/core": "^7.24.4",
-    "@babel/preset-env": "^7.24.4",
-    "@babel/preset-react": "^7.24.1",
+    "@babel/cli": "^7.24.6",
+    "@babel/core": "^7.24.6",
+    "@babel/preset-env": "^7.24.6",
+    "@babel/preset-react": "^7.24.6",
     "@storybook/react": "^6.5.16",
     "babel-plugin-inline-react-svg": "^2.0.2",
-    "glob": "^10.3.12"
+    "glob": "^10.4.1"
   },
   "exports": {
     ".": {
@@ -77,5 +79,5 @@
       "require": "./lib/"
     }
   },
-  "gitHead": "608cc097c964e4e993265f6376b0134457554117"
+  "gitHead": "f066eec3d7942533b3dbc88419840e3ce06a05d1"
 }